Merge pilot.(none):/data/msvensson/mysql/bug28497/my50-bug28497

into  pilot.(none):/data/msvensson/mysql/bug28497/my51-bug28497

mysql-test/t/grant.test

@@ -1003,7 +1003,7 @@ DROP USER bug23556@localhost;
 # Bug #6774: Replication fails with Wrong usage of DB GRANT and GLOBAL PRIVILEGES
 #
 # Check if GRANT ... ON * ... fails when no database is selected
-connect (con1, localhost, root,,*NO-ONE*)
+connect (con1, localhost, root,,*NO-ONE*);
 connection con1;
 --error ER_NO_DB_ERROR
 GRANT PROCESS ON * TO user@localhost;

mysql-test/t/rpl_packet.test

@@ -58,7 +58,7 @@ START SLAVE;
 
 # Reconnect to master for new setting to take effect
 disconnect master;
-connect (master, localhost, root)
+connect (master, localhost, root);
 connection master;
 
 CREATE TABLe `t1` (`f1` LONGTEXT) ENGINE=MyISAM;