mirror of
https://github.com/MariaDB/server.git
synced 2025-08-05 13:16:09 +03:00
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.
This commit is contained in:
@@ -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)
|
|||||||
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;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user