1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUG#12929631 : Execute crashes with --verbose output (Windows)

Browse Source 
This patch corrects an error encountered in PB where Windows machines
are built in release mode have an extraneous parameter added in place
of the --console option. This is caused by the insert of '(null' 
instead of an empty string. In non-debug mode, the string is explicitly
set to an empty string.

Patch also fixes a result mismatch on Windows machines.
This commit is contained in:
Chuck Bell 2011-09-09 10:39:44 -04:00
parent 1830d76adf
commit d10bddf0ed
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/mysql_plugin.c
View File

@ -1169,6 +1169,8 @@ static int bootstrap_server(char *server_path, char *bootstrap_file)
if (opt_verbose) if (opt_verbose)
verbose_str= "--console"; verbose_str= "--console";
else
verbose_str= "";
if (has_spaces(opt_datadir) || has_spaces(opt_basedir) || if (has_spaces(opt_datadir) || has_spaces(opt_basedir) ||
has_spaces(bootstrap_file)) has_spaces(bootstrap_file))
format_str= "\"%s %s --bootstrap --datadir=%s --basedir=%s < %s\""; format_str= "\"%s %s --bootstrap --datadir=%s --basedir=%s < %s\"";

1
mysql-test/t/mysql_plugin.test
View File

@ -224,6 +224,7 @@ let $MYSQL_PLUGIN_CMD= $MYSQL_PLUGIN -n --datadir=/data_not_there/ --basedir=$MY
--echo # Attempt to use bad paths - basedir --echo # Attempt to use bad paths - basedir
--echo # --echo #
let $MYSQL_PLUGIN_CMD= $MYSQL_PLUGIN -n --datadir=$MYSQLD_DATADIR --basedir=/basedir_not_there/ --plugin-dir=$PLUGIN_DIR --mysqld=$MYSQLD_BASEDIR --my-print-defaults=$MYSQL_MY_PRINT_DEFAULTS_BASEDIR; let $MYSQL_PLUGIN_CMD= $MYSQL_PLUGIN -n --datadir=$MYSQLD_DATADIR --basedir=/basedir_not_there/ --plugin-dir=$PLUGIN_DIR --mysqld=$MYSQLD_BASEDIR --my-print-defaults=$MYSQL_MY_PRINT_DEFAULTS_BASEDIR;
replace_result "/basedir_not_there//" "/basedir_not_there/";
--error 1,2,256 --error 1,2,256
--exec $MYSQL_PLUGIN_CMD DISABLE daemon_example 2>&1 --exec $MYSQL_PLUGIN_CMD DISABLE daemon_example 2>&1