Commit 307fdbe5 authored by chuck.bell@oracle.com's avatar chuck.bell@oracle.com

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.
parent 869b596b
...@@ -1160,7 +1160,6 @@ static int bootstrap_server(char *server_path, char *bootstrap_file) ...@@ -1160,7 +1160,6 @@ static int bootstrap_server(char *server_path, char *bootstrap_file)
{ {
char bootstrap_cmd[FN_REFLEN]; char bootstrap_cmd[FN_REFLEN];
int error= 0; int error= 0;
int ret= 0;
#ifdef __WIN__ #ifdef __WIN__
char *format_str= 0; char *format_str= 0;
...@@ -1196,7 +1195,7 @@ static int bootstrap_server(char *server_path, char *bootstrap_file) ...@@ -1196,7 +1195,7 @@ static int bootstrap_server(char *server_path, char *bootstrap_file)
if (error) if (error)
fprintf(stderr, fprintf(stderr,
"ERROR: Unexpected result from bootstrap. Error code: %d.\n", "ERROR: Unexpected result from bootstrap. Error code: %d.\n",
ret); error);
return error; return error;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment