1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00

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

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

View File

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