summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2023-03-09 14:53:29 +0200
committerMonty <monty@mariadb.org>2023-03-10 11:04:49 +0200
commitceb0e7f944b5c252d999ac06012ac0e05925c0b2 (patch)
treebd7fdc12ca2f56c387e0000e566b14c6e456ac4e /extra
parentb600671f758cac2ed595b5342033c8f92921eade (diff)
downloadmariadb-git-ceb0e7f944b5c252d999ac06012ac0e05925c0b2.tar.gz
Fixes to mysql_install_db
- Change to use 'mariadbd' instead of 'mysqld' in help texts and other visible places. - Start binary 'mariadbd' instead of 'mysqld'. This will remove a warning in 11.0 when running mysql_install_db. - Use my_print_defaults --mariadbd instead of --mysqld - Use --skip-log-error if the user don't have access to log-error file. This it needed to allow mysql_install_db to work silenty for users that has not write access to /var/log. Other things: - Updated my_print_defaults to support --mariadbd
Diffstat (limited to 'extra')
-rw-r--r--extra/my_print_defaults.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/extra/my_print_defaults.c b/extra/my_print_defaults.c
index ef2f483556a..115eb8e7084 100644
--- a/extra/my_print_defaults.c
+++ b/extra/my_print_defaults.c
@@ -50,6 +50,8 @@ static struct my_option my_long_options[] =
#endif
{"mysqld", 0, "Read the same set of groups that the mysqld binary does.",
&opt_mysqld, &opt_mysqld, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+ {"mariadbd", 0, "Read the same set of groups that the mariadbd binary does.",
+ &opt_mysqld, &opt_mysqld, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"no-defaults", 'n', "Return an empty string (useful for scripts).",
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
{"help", '?', "Display this help message and exit.",
@@ -70,7 +72,7 @@ static void cleanup_and_exit(int exit_code)
static void version()
{
- printf("%s Ver 1.7 for %s at %s\n",my_progname,SYSTEM_TYPE, MACHINE_TYPE);
+ printf("%s Ver 1.8 for %s at %s\n",my_progname,SYSTEM_TYPE, MACHINE_TYPE);
}