Merge branch 'mysql-5.5' into mysql-5.6

gkodinov · gkodinov · commit 96bb62f93937 · 2016-09-08T18:13:38.000+03:00
diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc
@@ -1564,8 +1564,10 @@ static my_bool get_pidfile(MYSQL *mysql, char *pidfile)
 
   if (mysql_query(mysql, "SHOW VARIABLES LIKE 'pid_file'"))
   {
-    my_printf_error(0, "query failed; error: '%s'", error_flags,
-		    mysql_error(mysql));
+    my_printf_error(mysql_errno(mysql),
+                    "The query to get the server's pid file failed,"
+                    " error: '%s'. Continuing.", error_flags,
+                    mysql_error(mysql));
   }
   result = mysql_store_result(mysql);
   if (result)

Original file line number	Diff line number	Diff line change
`@@ -1564,8 +1564,10 @@ static my_bool get_pidfile(MYSQL mysql, char pidfile)`
`1564`	`1564`
`1565`	`1565`	`if (mysql_query(mysql, "SHOW VARIABLES LIKE 'pid_file'"))`
`1566`	`1566`	`{`
`1567`		`- my_printf_error(0, "query failed; error: '%s'", error_flags,`
`1568`		`- mysql_error(mysql));`
	`1567`	`+ my_printf_error(mysql_errno(mysql),`
	`1568`	`+ "The query to get the server's pid file failed,"`
	`1569`	`+ " error: '%s'. Continuing.", error_flags,`
	`1570`	`+ mysql_error(mysql));`
`1569`	`1571`	`}`
`1570`	`1572`	`result = mysql_store_result(mysql);`
`1571`	`1573`	`if (result)`