Merge work:/home/bk/mysql

into mysql.sashanet.com:/home/sasha/src/bk/mysql

mysql-test/r/rpl000001.result

@@ -7,5 +7,11 @@ sum(length(word))
 0
 count(*)
 10
+select_priv	user
+N	blafasel2
+select_priv	user
+Y	blafasel2
 n
 3456
+select_priv	user
+Y	blafasel2

mysql-test/t/rpl000001.test

@@ -71,10 +71,18 @@ connection master1;
 drop table t1;
 create table t1 (n int);
 insert into t1 values(3456);
+use mysql;
+insert into user (Host, User, Password)
+ VALUES ("10.10.10.%", "blafasel2", "blafasel2");
+select select_priv,user from mysql.user where user = 'blafasel2';
+update user set Select_priv = "Y" where User="blafasel2";
+select select_priv,user from mysql.user where user = 'blafasel2';
+use test;
 save_master_pos;
 connection slave;
 sync_with_master;
 select n from t1;
+select select_priv,user from mysql.user where user = 'blafasel2';
 connection master1;
 drop table t1;
 save_master_pos;