merge

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
myisam/mi_search.c:
  Auto merged
sql/sql_select.cc:
  Auto merged

4 files changed, 31 insertions, 0 deletions

diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result
index 9e8e1b81687..653e25af799 100644
--- a/mysql-test/r/merge.result
+++ b/mysql-test/r/merge.result
@@ -127,3 +127,6 @@ t3	CREATE TABLE `t3` (
   `othr` int(11) NOT NULL default '0'
 ) TYPE=MRG_MyISAM UNION=(t1,t2)
 a
+a	b
+1	1
+1	2
diff --git a/mysql-test/r/rpl000001.result b/mysql-test/r/rpl000001.result
index a80fb618457..ebccb1e1e6b 100644
--- a/mysql-test/r/rpl000001.result
+++ b/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
diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test
index 0b14ba388ce..59da525990c 100644
--- a/mysql-test/t/merge.test
+++ b/mysql-test/t/merge.test
@@ -96,3 +96,17 @@ drop table t3,t2,t1;
 create table t1 (a int not null) type=merge;
 select * from t1;
 drop table t1;
+
+#
+# Bug found by Monty.
+#
+
+drop table if exists t3, t2, t1;
+create table t1 (a int not null, b int not null, key(a,b));
+create table t2 (a int not null, b int not null, key(a,b));
+create table t3 (a int not null, b int not null, key(a,b)) TYPE=MERGE UNION=(t1,t2);
+insert into t1 values (1,2),(2,1),(0,0),(4,4),(5,5),(6,6);
+insert into t2 values (1,1),(2,2),(0,0),(4,4),(5,5),(6,6);
+flush tables;
+select * from t3 where a=1 order by b limit 2;
+drop table t1,t2,t3;
diff --git a/mysql-test/t/rpl000001.test b/mysql-test/t/rpl000001.test
index 7989a679a70..99b5c3bfcae 100644
--- a/mysql-test/t/rpl000001.test
+++ b/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;