summaryrefslogtreecommitdiff
path: root/client/mysql_plugin.c
diff options
context:
space:
mode:
authorChuck Bell <chuck.bell@oracle.com>2011-09-09 10:39:44 -0400
committerChuck Bell <chuck.bell@oracle.com>2011-09-09 10:39:44 -0400
commit8433c8ce61956fdeea45a55c7262bf509aaefb0d (patch)
tree20f9390fc98be686d7a915a994e28b10bb851c3e /client/mysql_plugin.c
parenta5267797553519d1fcaaf51ff070d53cf525dc79 (diff)
downloadmariadb-git-8433c8ce61956fdeea45a55c7262bf509aaefb0d.tar.gz
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.
Diffstat (limited to 'client/mysql_plugin.c')
-rw-r--r--client/mysql_plugin.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/client/mysql_plugin.c b/client/mysql_plugin.c
index 406366efd51..825c962c486 100644
--- a/client/mysql_plugin.c
+++ b/client/mysql_plugin.c
@@ -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\"";