diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | client/mysql.cc | 2 | ||||
| -rw-r--r-- | client/mysql_upgrade.c | 1 | ||||
| -rw-r--r-- | client/mysqladmin.cc | 3 | ||||
| -rw-r--r-- | client/mysqlbinlog.cc | 3 | ||||
| -rw-r--r-- | client/mysqlcheck.c | 3 | ||||
| -rw-r--r-- | client/mysqldump.c | 3 | ||||
| -rw-r--r-- | client/mysqlimport.c | 3 | ||||
| -rw-r--r-- | client/mysqlshow.c | 3 | ||||
| -rw-r--r-- | client/mysqlslap.c | 3 | ||||
| -rw-r--r-- | client/mysqltest.cc | 3 | ||||
| -rw-r--r-- | include/mysql_version.h.in | 1 | ||||
| -rw-r--r-- | include/mysqld_default_groups.h | 1 | ||||
| -rw-r--r-- | scripts/mysql_install_db.sh | 8 | ||||
| -rw-r--r-- | scripts/mysqld_safe.sh | 6 |
15 files changed, 31 insertions, 13 deletions
diff --git a/.gitignore b/.gitignore index 66212558955..94795946e64 100644 --- a/.gitignore +++ b/.gitignore @@ -83,6 +83,7 @@ make_dist.cmake mariadb-*.*.*.tar.gz mariadb-*.*.*/ mysql-test/lib/My/SafeProcess/my_safe_process +mysql-test/lib/My/SafeProcess/wsrep_check_version mysql-test/mtr mysql-test/mysql-test-run mysql-test/var diff --git a/client/mysql.cc b/client/mysql.cc index 47ab7644a50..d3d273c3a72 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1034,7 +1034,7 @@ static COMMANDS commands[] = { }; static const char *load_default_groups[]= -{ "mysql", "client", "client-server", "client-mariadb", 0 }; +{ "mysql", "mariadb-client", "client", "client-server", "client-mariadb", 0 }; static int embedded_server_arg_count= 0; static char *embedded_server_args[MAX_SERVER_ARGS]; diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index 59ec622ad8c..39fe715bdff 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -173,6 +173,7 @@ static const char *load_default_groups[]= { "client", /* Read settings how to connect to server */ "mysql_upgrade", /* Read special settings for mysql_upgrade */ + "mariadb-upgrade", /* Read special settings for mysql_upgrade */ "client-server", /* Reads settings common between client & server */ "client-mariadb", /* Read mariadb unique client settings */ 0 diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc index baffe98abb7..32096fef996 100644 --- a/client/mysqladmin.cc +++ b/client/mysqladmin.cc @@ -237,7 +237,8 @@ static struct my_option my_long_options[] = static const char *load_default_groups[]= -{ "mysqladmin", "client", "client-server", "client-mariadb", 0 }; +{ "mysqladmin", "mariadb-admin", "client", "client-server", "client-mariadb", + 0 }; my_bool get_one_option(int optid, const struct my_option *opt __attribute__((unused)), diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index d28de8aeda6..f11019d707b 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -94,7 +94,8 @@ static const char *default_dbug_option = "d:t:o,/tmp/mysqlbinlog.trace"; const char *current_dbug_option= default_dbug_option; #endif static const char *load_groups[]= -{ "mysqlbinlog", "client", "client-server", "client-mariadb", 0 }; +{ "mysqlbinlog", "mariadb-binlog", "client", "client-server", "client-mariadb", + 0 }; static void error(const char *format, ...) ATTRIBUTE_FORMAT(printf, 1, 2); static void warning(const char *format, ...) ATTRIBUTE_FORMAT(printf, 1, 2); diff --git a/client/mysqlcheck.c b/client/mysqlcheck.c index 7e9546e0dc2..c1859440446 100644 --- a/client/mysqlcheck.c +++ b/client/mysqlcheck.c @@ -222,7 +222,8 @@ static struct my_option my_long_options[] = }; static const char *load_default_groups[]= -{ "mysqlcheck", "client", "client-server", "client-mariadb", 0 }; +{ "mysqlcheck", "mariadb-check", "client", "client-server", "client-mariadb", + 0 }; static void print_version(void); diff --git a/client/mysqldump.c b/client/mysqldump.c index 578bb0a067c..c8df04603f0 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -555,7 +555,8 @@ static struct my_option my_long_options[] = }; static const char *load_default_groups[]= -{ "mysqldump", "client", "client-server", "client-mariadb", 0 }; +{ "mysqldump", "mariadb-dump", "client", "client-server", "client-mariadb", + 0 }; static void maybe_exit(int error); static void die(int error, const char* reason, ...); diff --git a/client/mysqlimport.c b/client/mysqlimport.c index cfdb183414a..67dc11d7117 100644 --- a/client/mysqlimport.c +++ b/client/mysqlimport.c @@ -187,7 +187,8 @@ static struct my_option my_long_options[] = static const char *load_default_groups[]= -{ "mysqlimport","client", "client-server", "client-mariadb", 0 }; +{ "mysqlimport", "mariadb-import", "client", "client-server", "client-mariadb", + 0 }; static void print_version(void) diff --git a/client/mysqlshow.c b/client/mysqlshow.c index 4e2f9e83340..db5c2bbbbe6 100644 --- a/client/mysqlshow.c +++ b/client/mysqlshow.c @@ -56,7 +56,8 @@ static void print_res_top(MYSQL_RES *result); static void print_res_row(MYSQL_RES *result,MYSQL_ROW cur); static const char *load_default_groups[]= -{ "mysqlshow","client", "client-server", "client-mariadb", 0 }; +{ "mysqlshow", "mariadb-show", "client", "client-server", "client-mariadb", + 0 }; static char * opt_mysql_unix_port=0; int main(int argc, char **argv) diff --git a/client/mysqlslap.c b/client/mysqlslap.c index 3339acce314..473bb12dc11 100644 --- a/client/mysqlslap.c +++ b/client/mysqlslap.c @@ -177,7 +177,8 @@ static int get_options(int *argc,char ***argv); static uint opt_mysql_port= 0; static const char *load_default_groups[]= -{ "mysqlslap", "client", "client-server", "client-mariadb", 0 }; +{ "mysqlslap", "mariadb-slap", "client", "client-server", "client-mariadb", + 0 }; typedef struct statement statement; diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 139377d3889..3c9b26d0412 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -136,7 +136,8 @@ static my_bool server_initialized= 0; static my_bool is_windows= 0; static char **default_argv; static const char *load_default_groups[]= -{ "mysqltest", "client", "client-server", "client-mariadb", 0 }; +{ "mysqltest", "mariadb-test", "client", "client-server", "client-mariadb", + 0 }; static char line_buffer[MAX_DELIMITER_LENGTH], *line_buffer_pos= line_buffer; /* Info on properties that can be set with --enable_X and --disable_X */ diff --git a/include/mysql_version.h.in b/include/mysql_version.h.in index 59df2b7c086..ad719634335 100644 --- a/include/mysql_version.h.in +++ b/include/mysql_version.h.in @@ -14,6 +14,7 @@ #define MYSQL_SERVER_VERSION "@VERSION@-MariaDB" #define MYSQL_BASE_VERSION "mysqld-@MYSQL_BASE_VERSION@" #define MARIADB_BASE_VERSION "mariadb-@MYSQL_BASE_VERSION@" +#define MARIADBD_BASE_VERSION "mariadbd-@MYSQL_BASE_VERSION@" #define MYSQL_SERVER_SUFFIX_DEF "@MYSQL_SERVER_SUFFIX@" #define FRM_VER @DOT_FRM_VERSION@ #define MYSQL_VERSION_ID @MYSQL_VERSION_ID@ diff --git a/include/mysqld_default_groups.h b/include/mysqld_default_groups.h index 3bc82359787..cf6e92e3bc1 100644 --- a/include/mysqld_default_groups.h +++ b/include/mysqld_default_groups.h @@ -1,6 +1,7 @@ const char *load_default_groups[]= { "mysqld", "server", MYSQL_BASE_VERSION, "mariadb", MARIADB_BASE_VERSION, +"mariadbd", MARIADBD_BASE_VERSION, "client-server", #ifdef WITH_WSREP "galera", diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index 11dfb798a95..c68e34020cd 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -288,6 +288,11 @@ then elif test -n "$dirname0" -a -x "$dirname0/@bindir@/my_print_defaults" then print_defaults="$dirname0/@bindir@/my_print_defaults" +elif test -x "./extra/my_print_defaults" +then + srcdir="." + builddir="." + print_defaults="./extra/my_print_defaults" else print_defaults="@bindir@/my_print_defaults" fi @@ -300,7 +305,8 @@ fi # Now we can get arguments from the groups [mysqld] and [mysql_install_db] # in the my.cfg file, then re-run to merge with command line arguments. -parse_arguments `"$print_defaults" $defaults $defaults_group_suffix --mysqld mysql_install_db` +parse_arguments `"$print_defaults" $defaults $defaults_group_suffix --mysqld mysql_install_db mariadb-install-db` + parse_arguments PICK-ARGS-FROM-ARGV "$@" rel_mysqld="$dirname0/@INSTALL_SBINDIR@/mysqld" diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index 5f09ac3c235..d40dd9a0c5f 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -577,8 +577,8 @@ append_arg_to_args () { args= -# Get first arguments from the my.cnf file, groups [mysqld] and [mysqld_safe] -# and then merge with the command line arguments +# Get first arguments from the my.cnf file, groups [mysqld] and [server] +# (and related) and then merge with the command line arguments SET_USER=2 parse_arguments `$print_defaults $defaults --loose-verbose --mysqld` @@ -590,7 +590,7 @@ fi # If arguments come from [mysqld_safe] section of my.cnf # we complain about unrecognized options unrecognized_handling=complain -parse_arguments `$print_defaults $defaults --loose-verbose mysqld_safe safe_mysqld mariadb_safe` +parse_arguments `$print_defaults $defaults --loose-verbose mysqld_safe safe_mysqld mariadb_safe mariadbd-safe` # We only need to pass arguments through to the server if we don't # handle them here. So, we collect unrecognized options (passed on |