Merge with base 5.2

10 files changed, 22 insertions, 11 deletions

diff --git a/client/mysql.cc b/client/mysql.cc
index 0e1d9362df5..983953cfbea 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -1030,7 +1030,8 @@ static COMMANDS commands[] = {
   { (char *)NULL,       0, 0, 0, ""}
 };
 
-static const char *load_default_groups[]= { "mysql","client",0 };
+static const char *load_default_groups[]=
+{ "mysql", "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 c72f13eded6..b67ca5456d7 100644
--- a/client/mysql_upgrade.c
+++ b/client/mysql_upgrade.c
@@ -816,8 +816,10 @@ static int run_sql_fix_privilege_tables(void)
 
 static const char *load_default_groups[]=
 {
-  "client", /* Read settings how to connect to server */
-  "mysql_upgrade", /* Read special settings for mysql_upgrade*/
+  "client",          /* Read settings how to connect to server */
+  "mysql_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 9e6a1513af6..5f3175f3ed6 100644
--- a/client/mysqladmin.cc
+++ b/client/mysqladmin.cc
@@ -223,7 +223,8 @@ static struct my_option my_long_options[] =
 };
 
 
-static const char *load_default_groups[]= { "mysqladmin","client",0 };
+static const char *load_default_groups[]=
+{ "mysqladmin", "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 266160890f6..b6668161ce5 100644
--- a/client/mysqlbinlog.cc
+++ b/client/mysqlbinlog.cc
@@ -65,7 +65,8 @@ static FILE *result_file;
 #ifndef DBUG_OFF
 static const char* default_dbug_option = "d:t:o,/tmp/mysqlbinlog.trace";
 #endif
-static const char *load_default_groups[]= { "mysqlbinlog","client",0 };
+static const char *load_default_groups[]=
+{ "mysqlbinlog", "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 41249949633..14e02bbb328 100644
--- a/client/mysqlcheck.c
+++ b/client/mysqlcheck.c
@@ -187,7 +187,8 @@ static struct my_option my_long_options[] =
   {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
 };
 
-static const char *load_default_groups[] = { "mysqlcheck", "client", 0 };
+static const char *load_default_groups[]=
+{ "mysqlcheck", "client", "client-server", "client-mariadb", 0 };
 
 
 static void print_version(void);
diff --git a/client/mysqldump.c b/client/mysqldump.c
index bb09af4a3c2..7a1590f8a95 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -480,7 +480,8 @@ static struct my_option my_long_options[] =
   {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
 };
 
-static const char *load_default_groups[]= { "mysqldump","client",0 };
+static const char *load_default_groups[]=
+{ "mysqldump", "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 43994a4f514..3367eb77cbc 100644
--- a/client/mysqlimport.c
+++ b/client/mysqlimport.c
@@ -183,7 +183,8 @@ static struct my_option my_long_options[] =
 };
 
 
-static const char *load_default_groups[]= { "mysqlimport","client",0 };
+static const char *load_default_groups[]=
+{ "mysqlimport","client", "client-server", "client-mariadb", 0 };
 
 #include <help_start.h>
 
diff --git a/client/mysqlshow.c b/client/mysqlshow.c
index 698516e0794..fafb07cfcbb 100644
--- a/client/mysqlshow.c
+++ b/client/mysqlshow.c
@@ -53,7 +53,8 @@ static void print_res_header(MYSQL_RES *result);
 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",0 };
+static const char *load_default_groups[]=
+{ "mysqlshow","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 0b3ea2a0065..8a45b567e84 100644
--- a/client/mysqlslap.c
+++ b/client/mysqlslap.c
@@ -178,7 +178,8 @@ static uint opt_protocol= 0;
 static int get_options(int *argc,char ***argv);
 static uint opt_mysql_port= 0;
 
-static const char *load_default_groups[]= { "mysqlslap","client",0 };
+static const char *load_default_groups[]=
+{ "mysqlslap", "client", "client-server", "client-mariadb", 0 };
 
 typedef struct statement statement;
 
diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index 1fecd4fa7ac..65ae93696ea 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -118,7 +118,8 @@ static my_bool abort_on_error= 1;
 static my_bool server_initialized= 0;
 static my_bool is_windows= 0;
 static char **default_argv;
-static const char *load_default_groups[]= { "mysqltest", "client", 0 };
+static const char *load_default_groups[]=
+{ "mysqltest", "client", "client-server", "client-mariadb", 0 };
 static char line_buffer[MAX_DELIMITER_LENGTH], *line_buffer_pos= line_buffer;
 
 static uint start_lineno= 0; /* Start line of current command */