Merge branch 'mysql-5.6' into mysql-5.7

trosten · trosten · commit e11403dc11b2 · 2018-12-18T20:05:35.000+01:00
diff --git a/mysql-test/r/mysqladmin_shutdown.result b/mysql-test/r/mysqladmin_shutdown.result
@@ -1,4 +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.
+mysqladmin: [Warning] Using a password on the command line interface can be insecure.
diff --git a/mysql-test/t/mysqladmin_shutdown.test b/mysql-test/t/mysqladmin_shutdown.test
@@ -1,3 +1,6 @@
+# Embedded server doesn't support external clients
+--source include/not_embedded.inc
+
 # Supported on platforms with UNIX sockets only
 --source include/not_windows.inc
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`#`
`2`	`2`	`# Bug#28466137 MYSQLADMIN SHUTDOWN DOES NOT WAIT FOR MYSQL TO SHUT DOWN ANYMORE`
`3`	`3`	`#`
`4`		`-Warning: Using a password on the command line interface can be insecure.`
	`4`	`+mysqladmin: [Warning] Using a password on the command line interface can be insecure.`