Merge branch '2.2' into 2.3

2018-10-30 13:25:38 +02:00
parent b06d9830ae 91c5f8580c
commit ce35b0d541
9 changed files with 226 additions and 103 deletions
--- a/server/modules/routing/binlogrouter/maxbinlogcheck.cc
+++ b/server/modules/routing/binlogrouter/maxbinlogcheck.cc
@ -160,7 +160,7 @@ int main(int argc, char** argv)
        exit(EXIT_FAILURE);
    }

-    int fd = open(path, binlog_file.fix ? O_RDWR : O_RDONLY, 0666);
+    int fd = open(path, binlog_file.fix ? O_RDWR : O_RDONLY, 0660);
    if (fd == -1)
    {
        printf("ERROR: Failed to open binlog file %s: %s.\n",