Merge polly.(none):/home/kaa/src/bug30164/my50-bug30164

into  polly.(none):/home/kaa/src/bug30164/my51-bug30164


mysql-test/t/mysql.test:
  Auto merged

mysql-test/t/mysql.test

@@ -277,7 +277,7 @@ EOF
 #
 # bug #30164: Using client side macro inside server side comments generates broken queries
 #
---exec $MYSQL test -e '/*! \C latin1 */ select 1;'
+--exec $MYSQL test -e "/*! \C latin1 */ select 1;"
 
 --echo End of 5.0 tests