database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

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

Browse Source
This commit is contained in:
Monty
2020-03-31 14:10:45 +03:00
parent e3130d22e1
commit 7866b72304
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/mysql.cc
View File

@@ -205,7 +205,7 @@ static CHARSET_INFO *charset_info= &my_charset_latin1;
#include "sslopt-vars.h" #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_fprintf(FILE *file, const char *fmt, ...);
void tee_fputs(const char *s, FILE *file); void tee_fputs(const char *s, FILE *file);

2
client/mysql_upgrade.c
View File

@@ -62,7 +62,7 @@ static my_bool tty_password= 0;
static char opt_tmpdir[FN_REFLEN] = ""; static char opt_tmpdir[FN_REFLEN] = "";
#ifndef DBUG_OFF #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 #endif
static char **defaults_argv; static char **defaults_argv;

2
client/mysqlbinlog.cc
View File

@@ -97,7 +97,7 @@ static char *result_file_name= 0;
static const char *output_prefix= ""; static const char *output_prefix= "";
#ifndef DBUG_OFF #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; const char *current_dbug_option= default_dbug_option;
#endif #endif
static const char *load_groups[]= static const char *load_groups[]=

2
client/mysqldump.c
View File

@@ -187,7 +187,7 @@ static const char *mysql_universal_client_charset=
MYSQL_UNIVERSAL_CLIENT_CHARSET; MYSQL_UNIVERSAL_CLIENT_CHARSET;
static char *default_charset; static char *default_charset;
static CHARSET_INFO *charset_info= &my_charset_latin1; 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? */ /* have we seen any VIEWs during table scanning? */
my_bool seen_views= 0; my_bool seen_views= 0;
const char *compatible_mode_names[]= const char *compatible_mode_names[]=

2
client/mysqlslap.c
View File

@@ -167,7 +167,7 @@ static char *create_string;
uint *concurrency; uint *concurrency;
static char mysql_charsets_dir[FN_REFLEN+1]; 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; const char *opt_csv_str;
File csv_file; File csv_file;

4
sql/mysqld.cc
View File

@@ -7881,8 +7881,8 @@ static int mysql_init_variables(void)
/* Variables that depends on compile options */ /* Variables that depends on compile options */
#ifndef DBUG_OFF #ifndef DBUG_OFF
default_dbug_option=IF_WIN("d:t:i:O,\\mysqld.trace", default_dbug_option=IF_WIN("d:t:i:O,\\mariadbd.trace",
"d:t:i:o,/tmp/mysqld.trace"); "d:t:i:o,/tmp/mariadbd.trace");
current_dbug_option= default_dbug_option; current_dbug_option= default_dbug_option;
#endif #endif
opt_error_log= IF_WIN(1,0); opt_error_log= IF_WIN(1,0);