Commit e11d7971 authored by Guilhem Bichot's avatar Guilhem Bichot

merge from latest 5.5-bugteam

parents 957c09f6 447c5030
...@@ -400,7 +400,7 @@ FLUSH PRIVILEGES; ...@@ -400,7 +400,7 @@ FLUSH PRIVILEGES;
--echo # --echo #
--echo # Executing 'mysql' --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' --echo # Executing 'mysqladmin'
--exec $MYSQLADMIN -u root -S $MASTER_MYSOCK -P $MASTER_MYPORT --default-auth=auth_test_plugin $PLUGIN_AUTH_OPT ping --exec $MYSQLADMIN -u root -S $MASTER_MYSOCK -P $MASTER_MYPORT --default-auth=auth_test_plugin $PLUGIN_AUTH_OPT ping
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment