bk commit into 5.1 tree (msvensson:1.2509)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-06-01 13:50:59+02:00, msvensson@pilot.(none) +2 -0
  Merge pilot.(none):/data/msvensson/mysql/bug28497/my50-bug28497
  into  pilot.(none):/data/msvensson/mysql/bug28497/my51-bug28497
  MERGE: 1.1810.2938.22

  mysql-test/t/grant.test@stripped, 2007-06-01 13:50:56+02:00, msvensson@pilot.(none) +0 -0
    Auto merged
    MERGE: 1.41.1.16

  mysql-test/t/rpl_packet.test@stripped, 2007-06-01 13:50:56+02:00, msvensson@pilot.(none) +0 -0
    Auto merged
    MERGE: 1.4.2.1

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	pilot.(none)
# Root:	/data/msvensson/mysql/bug28497/my51-bug28497/RESYNC

--- 1.6/mysql-test/t/rpl_packet.test	2007-04-07 11:55:23 +02:00
+++ 1.7/mysql-test/t/rpl_packet.test	2007-06-01 13:50:56 +02:00
@@ -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;

--- 1.59/mysql-test/t/grant.test	2007-05-12 06:44:15 +02:00
+++ 1.60/mysql-test/t/grant.test	2007-06-01 13:50:56 +02:00
@@ -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;