Skip to content

Commit

Permalink
tree: Handle mx_mysql_option_set_default_file errors
Browse files Browse the repository at this point in the history
After commit 2e80051 ("mx_mysql: Fix warning in
mx_mysql_option_set_default_file"), mx_mysql_option_set_default_file()
no longer outputs a warning by itself when the file is not readable.
MySQL itself silently ignores unreadable config files.

Make all callers handle the error.
  • Loading branch information
donald committed Jan 10, 2024
1 parent e6951d5 commit 9333710
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 6 deletions.
3 changes: 2 additions & 1 deletion mxqadmin.c
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,8 @@ int main(int argc, char *argv[])
res = mx_mysql_initialize(&mysql);
assert(res == 0);

mx_mysql_option_set_default_file(mysql, arg_mysql_default_file);
if (mx_mysql_option_set_default_file(mysql, arg_mysql_default_file) < 0)
mx_die("%s: %s\n", arg_mysql_default_file, mx_mysql_error());
mx_mysql_option_set_default_group(mysql, arg_mysql_default_group);

res = mx_mysql_connect_forever(&mysql);
Expand Down
3 changes: 2 additions & 1 deletion mxqd.c
Original file line number Diff line number Diff line change
Expand Up @@ -733,7 +733,8 @@ static int server_init(struct mxq_server *server, int argc, char *argv[])
res = mx_mysql_initialize(&(server->mysql));
assert(res == 0);

mx_mysql_option_set_default_file(server->mysql, arg_mysql_default_file);
if (mx_mysql_option_set_default_file(server->mysql, arg_mysql_default_file) < 0)
mx_die("%s: %s\n", arg_mysql_default_file, mx_mysql_error());
mx_mysql_option_set_default_group(server->mysql, arg_mysql_default_group);
mx_mysql_option_set_reconnect(server->mysql, 1);

Expand Down
3 changes: 2 additions & 1 deletion mxqdump.c
Original file line number Diff line number Diff line change
Expand Up @@ -730,7 +730,8 @@ int main(int argc, char *argv[])
res = mx_mysql_initialize(&mysql);
assert(res == 0);

mx_mysql_option_set_default_file(mysql, arg_mysql_default_file);
if (mx_mysql_option_set_default_file(mysql, arg_mysql_default_file) < 0)
mx_die("%s: %s\n", arg_mysql_default_file, mx_mysql_error());
mx_mysql_option_set_default_group(mysql, arg_mysql_default_group);

res = mx_mysql_connect_forever(&mysql);
Expand Down
3 changes: 2 additions & 1 deletion mxqkill.c
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,8 @@ int main(int argc, char *argv[])
res = mx_mysql_initialize(&mysql);
assert(res == 0);

mx_mysql_option_set_default_file(mysql, arg_mysql_default_file);
if (mx_mysql_option_set_default_file(mysql, arg_mysql_default_file) < 0)
mx_die("%s: %s\n", arg_mysql_default_file, mx_mysql_error());
mx_mysql_option_set_default_group(mysql, arg_mysql_default_group);

res = mx_mysql_connect_forever(&mysql);
Expand Down
3 changes: 2 additions & 1 deletion mxqset.c
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,8 @@ int main(int argc, char **argv) {
exit_usage();

assert(mx_mysql_initialize(&mysql) == 0);
mx_mysql_option_set_default_file(mysql, MXQ_MYSQL_DEFAULT_FILE);
if (mx_mysql_option_set_default_file(mysql, MXQ_MYSQL_DEFAULT_FILE) < 0)
mx_die("%s: %s\n", MXQ_MYSQL_DEFAULT_FILE, mx_mysql_error());
mx_mysql_option_set_default_group(mysql, MXQ_MYSQL_DEFAULT_GROUP);
assert(mx_mysql_connect_forever(&mysql) == 0);

Expand Down
3 changes: 2 additions & 1 deletion mxqsub.c
Original file line number Diff line number Diff line change
Expand Up @@ -1160,7 +1160,8 @@ int main(int argc, char *argv[])
res = mx_mysql_initialize(&mysql);
assert(res == 0);

mx_mysql_option_set_default_file(mysql, arg_mysql_default_file);
if (mx_mysql_option_set_default_file(mysql, arg_mysql_default_file) < 0)
mx_die("%s: %s\n", arg_mysql_default_file, mx_mysql_error());
mx_mysql_option_set_default_group(mysql, arg_mysql_default_group);

res = mx_mysql_connect_forever(&mysql);
Expand Down

0 comments on commit 9333710

Please sign in to comment.