Updated client and server to use new binary names in --debug traces

6 files changed, 7 insertions, 7 deletions

diff --git a/client/mysql.cc b/client/mysql.cc
index f3c936e3028..99b4efc7012 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -205,7 +205,7 @@ static CHARSET_INFO *charset_info= &my_charset_latin1;
 
 #include "sslopt-vars.h"
 
-const char *default_dbug_option="d:t:o,/tmp/mysql.trace";
+const char *default_dbug_option="d:t:o,/tmp/mariadb.trace";
 
 void tee_fprintf(FILE *file, const char *fmt, ...);
 void tee_fputs(const char *s, FILE *file);
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c
index bea82c2a112..7447a96aecf 100644
--- a/client/mysql_upgrade.c
+++ b/client/mysql_upgrade.c
@@ -62,7 +62,7 @@ static my_bool tty_password= 0;
 static char opt_tmpdir[FN_REFLEN] = "";
 
 #ifndef DBUG_OFF
-static char *default_dbug_option= (char*) "d:t:O,/tmp/mysql_upgrade.trace";
+static char *default_dbug_option= (char*) "d:t:O,/tmp/mariadb-upgrade.trace";
 #endif
 
 static char **defaults_argv;
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
index 9e166f90583..ed0d9ef8ea4 100644
--- a/client/mysqlbinlog.cc
+++ b/client/mysqlbinlog.cc
@@ -97,7 +97,7 @@ static char *result_file_name= 0;
 static const char *output_prefix= "";
 
 #ifndef DBUG_OFF
-static const char *default_dbug_option = "d:t:o,/tmp/mysqlbinlog.trace";
+static const char *default_dbug_option = "d:t:o,/tmp/mariadb-binlog.trace";
 const char *current_dbug_option= default_dbug_option;
 #endif
 static const char *load_groups[]=
diff --git a/client/mysqldump.c b/client/mysqldump.c
index 263b6ffbf38..dfaecf16015 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -187,7 +187,7 @@ static const char *mysql_universal_client_charset=
   MYSQL_UNIVERSAL_CLIENT_CHARSET;
 static char *default_charset;
 static CHARSET_INFO *charset_info= &my_charset_latin1;
-const char *default_dbug_option="d:t:o,/tmp/mysqldump.trace";
+const char *default_dbug_option="d:t:o,/tmp/mariadb-dump.trace";
 /* have we seen any VIEWs during table scanning? */
 my_bool seen_views= 0;
 const char *compatible_mode_names[]=
diff --git a/client/mysqlslap.c b/client/mysqlslap.c
index 7d3c5747b18..ff08a8565c1 100644
--- a/client/mysqlslap.c
+++ b/client/mysqlslap.c
@@ -167,7 +167,7 @@ static char *create_string;
 uint *concurrency;
 static char mysql_charsets_dir[FN_REFLEN+1];
 
-const char *default_dbug_option="d:t:o,/tmp/mysqlslap.trace";
+const char *default_dbug_option="d:t:o,/tmp/mariadb-slap.trace";
 const char *opt_csv_str;
 File csv_file;
 
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 0b714cc346c..97dfca47beb 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -7881,8 +7881,8 @@ static int mysql_init_variables(void)
   
   /* Variables that depends on compile options */
 #ifndef DBUG_OFF
-  default_dbug_option=IF_WIN("d:t:i:O,\\mysqld.trace",
-			     "d:t:i:o,/tmp/mysqld.trace");
+  default_dbug_option=IF_WIN("d:t:i:O,\\mariadbd.trace",
+			     "d:t:i:o,/tmp/mariadbd.trace");
   current_dbug_option= default_dbug_option;
 #endif
   opt_error_log= IF_WIN(1,0);