bk commit into 5.0 tree (lars:1.2496)

[Lars Thalmann]

Below is the list of changes that have just been committed into a local
5.0 repository of lthalmann. When lthalmann 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-21 16:55:52+02:00, lars@stripped +2 -0
  Test fix

  mysql-test/r/rpl_grant.result@stripped, 2007-06-21 16:55:48+02:00, lars@stripped +16 -16
    Test fix

  mysql-test/t/rpl_grant.test@stripped, 2007-06-21 16:55:49+02:00, lars@stripped +8 -4
    Test fix

# 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:	lars
# Host:	dl145k.mysql.com
# Root:	/nfsdisk1/lars/bk/mysql-5.0-rpl

--- 1.1/mysql-test/r/rpl_grant.result	2007-06-21 16:55:56 +02:00
+++ 1.2/mysql-test/r/rpl_grant.result	2007-06-21 16:55:56 +02:00
@@ -7,40 +7,40 @@ start slave;
 **** On Master ****
 CREATE USER dummy@localhost;
 CREATE USER dummy1@localhost, dummy2@localhost;
-SELECT user, host FROM mysql.user;
+SELECT user, host FROM mysql.user WHERE user != 'root';
 user	host
-root	127.0.0.1
 dummy	localhost
 dummy1	localhost
 dummy2	localhost
-root	localhost
-root	romeo.kindahl.net
+SELECT COUNT(*) FROM mysql.user;
+COUNT(*)
+6
 **** On Slave ****
-SELECT user,host FROM mysql.user;
+SELECT user,host FROM mysql.user WHERE user != 'root';
 user	host
-root	127.0.0.1
 dummy	localhost
 dummy1	localhost
 dummy2	localhost
-root	localhost
-root	romeo.kindahl.net
+SELECT COUNT(*) FROM mysql.user;
+COUNT(*)
+6
 **** On Master ****
 DROP USER nonexisting@localhost;
 ERROR HY000: Operation DROP USER failed for 'nonexisting'@'localhost'
 DROP USER nonexisting@localhost, dummy@localhost;
 ERROR HY000: Operation DROP USER failed for 'nonexisting'@'localhost'
 DROP USER dummy1@localhost, dummy2@localhost;
-SELECT user, host FROM mysql.user;
+SELECT user, host FROM mysql.user WHERE user != 'root';
 user	host
-root	127.0.0.1
-root	localhost
-root	romeo.kindahl.net
+SELECT COUNT(*) FROM mysql.user;
+COUNT(*)
+3
 **** On Slave ****
-SELECT user,host FROM mysql.user;
+SELECT user,host FROM mysql.user WHERE user != 'root';
 user	host
-root	127.0.0.1
-root	localhost
-root	romeo.kindahl.net
+SELECT COUNT(*) FROM mysql.user;
+COUNT(*)
+3
 SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1

--- 1.1/mysql-test/t/rpl_grant.test	2007-06-21 16:55:56 +02:00
+++ 1.2/mysql-test/t/rpl_grant.test	2007-06-21 16:55:56 +02:00
@@ -9,10 +9,12 @@ connection master;
 CREATE USER dummy@localhost;
 CREATE USER dummy1@localhost, dummy2@localhost;
 
-SELECT user, host FROM mysql.user;
+SELECT user, host FROM mysql.user WHERE user != 'root'; # root host non-determ
+SELECT COUNT(*) FROM mysql.user;
 sync_slave_with_master;
 --echo **** On Slave ****
-SELECT user,host FROM mysql.user;
+SELECT user,host FROM mysql.user WHERE user != 'root'; # root host non-determ
+SELECT COUNT(*) FROM mysql.user;
 
 --echo **** On Master ****
 connection master;
@@ -28,10 +30,12 @@ DROP USER nonexisting@localhost, dummy@l
 # All users exist
 DROP USER dummy1@localhost, dummy2@localhost;
 
-SELECT user, host FROM mysql.user;
+SELECT user, host FROM mysql.user WHERE user != 'root'; # root host non-determ
+SELECT COUNT(*) FROM mysql.user;
 sync_slave_with_master;
 --echo **** On Slave ****
-SELECT user,host FROM mysql.user;
+SELECT user,host FROM mysql.user WHERE user != 'root'; # root host non-determ
+SELECT COUNT(*) FROM mysql.user;
 
 --replace_result $MASTER_MYPORT MASTER_PORT
 --replace_column 1 # 8 # 9 # 23 # 33 #