Merge branch 'mysql-5.6' into mysql-5.7

Author: trosten

client/mysqladmin.cc

@@ -1559,7 +1559,7 @@ static my_bool get_pidfile(MYSQL *mysql, char *pidfile)
 {
   MYSQL_RES* result;
 
-  if (mysql_query(mysql, "SHOW VARIABLES LIKE 'pid_file'"))
+  if (mysql_query(mysql, "SELECT @@datadir, @@pid_file"))
   {
     my_printf_error(mysql_errno(mysql),
                     "The query to get the server's pid file failed,"
@@ -1570,8 +1570,13 @@ static my_bool get_pidfile(MYSQL *mysql, char *pidfile)
   if (result)
   {
     MYSQL_ROW row=mysql_fetch_row(result);
-    if (row)
-      my_stpcpy(pidfile, row[1]);
+    if (row) {
+      char datadir[FN_REFLEN];
+      char pidfile_option[FN_REFLEN];
+      my_stpcpy(datadir, row[0]);
+      my_stpcpy(pidfile_option, row[1]);
+      (void) my_load_path(pidfile, pidfile_option, datadir);
+    }
     mysql_free_result(result);
     return row == 0;				/* Error if row = 0 */
   }

mysql-test/r/mysqladmin_shutdown.result

@@ -0,0 +1,4 @@
+#
+# Bug#28466137 MYSQLADMIN SHUTDOWN DOES NOT WAIT FOR MYSQL TO SHUT DOWN ANYMORE
+#
+Warning: Using a password on the command line interface can be insecure.

mysql-test/t/mysqladmin_shutdown.test

@@ -0,0 +1,25 @@
+# Supported on platforms with UNIX sockets only
+--source include/not_windows.inc
+
+--echo #
+--echo # Bug#28466137 MYSQLADMIN SHUTDOWN DOES NOT WAIT FOR MYSQL TO SHUT DOWN ANYMORE
+--echo #
+
+--let $_pid_file_location= `SELECT @@pid_file`
+
+# Write file to make mtr expect the shutdown and avoid implicit restart
+--let $_server_id= `SELECT @@server_id`
+--let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.$_server_id.expect
+--exec echo "wait" > $_expect_file_name
+
+--exec $MYSQLADMIN -uroot --password="" -S $MASTER_MYSOCK shutdown 2>&1
+
+# pid file should be gone
+--error 1
+--file_exists $_pid_file_location
+
+--source include/wait_until_disconnected.inc
+
+--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--enable_reconnect
+--source include/wait_until_connected_again.inc