bk commit into 5.0 tree (mkindahl:1.2575)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.0 repository of mkindahl.  When mkindahl 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, 2008-02-04 13:19:29+01:00, mkindahl@stripped +1 -0
  Updating result file.

  mysql-test/r/rpl_user.result@stripped, 2008-02-04 13:19:20+01:00, mkindahl@stripped +11 -8
    Result change.

diff -Nrup a/mysql-test/r/rpl_user.result b/mysql-test/r/rpl_user.result
--- a/mysql-test/r/rpl_user.result	2008-01-25 08:02:24 +01:00
+++ b/mysql-test/r/rpl_user.result	2008-02-04 13:19:20 +01:00
@@ -4,8 +4,12 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
-reset master;
+set sql_log_bin=0;
 delete from mysql.user where Host='fakehost';
+set sql_log_bin=1;
+set sql_log_bin=0;
+delete from mysql.user where Host='fakehost';
+set sql_log_bin=1;
 create user 'foo'@'fakehost';
 create user 'foo'@'fakehost', 'bar'@'fakehost';
 ERROR HY000: Operation CREATE USER failed for 'foo'@'fakehost'
@@ -33,10 +37,9 @@ select Host,User from mysql.user where H
 Host	User
 show binlog events from 98;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	98	Query	1	#	use `test`; delete from mysql.user where Host='fakehost'
-master-bin.000001	205	Query	1	#	use `test`; create user 'foo'@'fakehost'
-master-bin.000001	296	Query	1	#	use `test`; create user 'foo'@'fakehost', 'bar'@'fakehost'
-master-bin.000001	405	Query	1	#	use `test`; rename user 'foo'@'fakehost' to 'foofoo'@'fakehost'
-master-bin.000001	519	Query	1	#	use `test`; rename user 'not_exist_user1'@'fakehost' to 'foobar'@'fakehost', 'bar'@'fakehost' to 'barbar'@'fakehost'
-master-bin.000001	686	Query	1	#	use `test`; drop user 'foofoo'@'fakehost'
-master-bin.000001	778	Query	1	#	use `test`; drop user 'not_exist_user1'@'fakehost', 'barbar'@'fakehost'
+master-bin.000001	98	Query	1	#	use `test`; create user 'foo'@'fakehost'
+master-bin.000001	189	Query	1	#	use `test`; create user 'foo'@'fakehost', 'bar'@'fakehost'
+master-bin.000001	298	Query	1	#	use `test`; rename user 'foo'@'fakehost' to 'foofoo'@'fakehost'
+master-bin.000001	412	Query	1	#	use `test`; rename user 'not_exist_user1'@'fakehost' to 'foobar'@'fakehost', 'bar'@'fakehost' to 'barbar'@'fakehost'
+master-bin.000001	579	Query	1	#	use `test`; drop user 'foofoo'@'fakehost'
+master-bin.000001	671	Query	1	#	use `test`; drop user 'not_exist_user1'@'fakehost', 'barbar'@'fakehost'