From 307fdbe526668cf41ba3d2c159f3e7cd048162f2 Mon Sep 17 00:00:00 2001
From: "chuck.bell@oracle.com" <>
Date: Mon, 17 Oct 2011 15:33:54 -0400
Subject: [PATCH] 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.
---
 client/mysql_plugin.c | 3 +--
 1 file changed, 1 insertion(+), 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;
 }