merge from latest 5.5-bugteam

e11d7971 · Guilhem Bichot · 957c09f6 · 447c5030 · e11d7971
Commit e11d7971 authored Dec 07, 2010 by Guilhem Bichot
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

mysql-test/t/plugin_auth.test mysql-test/t/plugin_auth.test +1 -1

No files found.
--- a/mysql-test/t/plugin_auth.test
+++ b/mysql-test/t/plugin_auth.test
@@ -400,7 +400,7 @@ FLUSH PRIVILEGES;
 --echo #

 --echo # Executing 'mysql'
--exec $MYSQL -u root -S $MASTER_MYSOCK -P $MASTER_MYPORT --default-auth=auth_test_plugin $PLUGIN_AUTH_OPT -e 'SELECT 1'
+--exec $MYSQL -u root -S $MASTER_MYSOCK -P $MASTER_MYPORT --default-auth=auth_test_plugin $PLUGIN_AUTH_OPT -e "SELECT 1"

 --echo # Executing 'mysqladmin'
 --exec $MYSQLADMIN -u root -S $MASTER_MYSOCK -P $MASTER_MYPORT --default-auth=auth_test_plugin $PLUGIN_AUTH_OPT ping