diff options
| author | unknown <chuck.bell@oracle.com> | 2011-10-17 15:33:54 -0400 |
|---|---|---|
| committer | unknown <chuck.bell@oracle.com> | 2011-10-17 15:33:54 -0400 |
| commit | 3c869a521ae17900fd60d67e5804f4a51cdec7cc (patch) | |
| tree | bec785e204880d22e24bd30cf8f46ddaf8c69eb6 | |
| parent | d1846e3b95c0bf75e0648e44136933e07f85f9fa (diff) | |
| download | mariadb-git-3c869a521ae17900fd60d67e5804f4a51cdec7cc.tar.gz | |
BUG#12968567: mysql_plugin : incorrect return from bootstrap failure
This patch corrects a defect whereby the bootstrap_server() method was
returning 0 instead of the error code generated. The code has been changed to
return the correct value returned from the bootstrap command.
| -rw-r--r-- | client/mysql_plugin.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/client/mysql_plugin.c b/client/mysql_plugin.c index dd5c02931c9..55f5ea0827e 100644 --- a/client/mysql_plugin.c +++ b/client/mysql_plugin.c @@ -1160,7 +1160,6 @@ static int bootstrap_server(char *server_path, char *bootstrap_file) { char bootstrap_cmd[FN_REFLEN]; int error= 0; - int ret= 0; #ifdef __WIN__ char *format_str= 0; @@ -1196,7 +1195,7 @@ static int bootstrap_server(char *server_path, char *bootstrap_file) if (error) fprintf(stderr, "ERROR: Unexpected result from bootstrap. Error code: %d.\n", - ret); + error); return error; } |