Commit 2de8a4bc authored by unknown's avatar unknown
Browse files

Resolve merge from 4.1 


mysql-test/r/grant_cache.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/t/grant_cache.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
sql/ha_myisammrg.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/handler.h:
  Resolve merge
sql/table.cc:
  Resolve merge
parents f8a20dbe 9e8cad1d

mysql-test/r/grant_cache.result

+2 −0
Original line number Diff line number Diff line 
drop table if exists test.t1,mysqltest.t1,mysqltest.t2;

drop database if exists mysqltest;

set GLOBAL query_cache_size=1355776;

reset query cache;

flush status;

show grants for current_user;
@@ -206,3 +207,4 @@ delete from mysql.columns_priv where user in ("mysqltest_1","mysqltest_2","mysql 
flush privileges;

drop table test.t1,mysqltest.t1,mysqltest.t2;

drop database mysqltest;

set GLOBAL query_cache_size=default;

mysql-test/r/merge.result

+10 −0
Original line number Diff line number Diff line
@@ -683,3 +683,13 @@ t3 1 a 1 a A NULL NULL NULL YES BTREE 
t3	1	a	2	b	A	NULL	NULL	NULL	YES	BTREE	

t3	1	a	3	c	A	NULL	NULL	NULL	YES	BTREE	

drop table t1, t2, t3;

CREATE TABLE t1 ( a INT AUTO_INCREMENT PRIMARY KEY, b VARCHAR(10), UNIQUE (b) )

ENGINE=MyISAM;

CREATE TABLE t2 ( a INT AUTO_INCREMENT, b VARCHAR(10), INDEX (a), INDEX (b) )

ENGINE=MERGE UNION (t1) INSERT_METHOD=FIRST;

INSERT INTO t2 (b) VALUES (1) ON DUPLICATE KEY UPDATE b=2;

INSERT INTO t2 (b) VALUES (1) ON DUPLICATE KEY UPDATE b=3;

SELECT b FROM t2;

b

3

DROP TABLE t1, t2;

mysql-test/t/grant_cache-master.opt

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
--set-variable=query_cache_size=1355776

mysql-test/t/grant_cache.test

+4 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ drop table if exists test.t1,mysqltest.t1,mysqltest.t2; 
drop database if exists mysqltest;

--enable_warnings



set GLOBAL query_cache_size=1355776;



reset query cache;

flush status;

connect (root,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
@@ -145,3 +147,5 @@ delete from mysql.columns_priv where user in ("mysqltest_1","mysqltest_2","mysql 
flush privileges;

drop table test.t1,mysqltest.t1,mysqltest.t2;

drop database mysqltest;



set GLOBAL query_cache_size=default;

mysql-test/t/merge.test

+12 −0
Original line number Diff line number Diff line
@@ -308,3 +308,15 @@ show index from t3; 


drop table t1, t2, t3;



#

# Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE

#

CREATE TABLE t1 ( a INT AUTO_INCREMENT PRIMARY KEY, b VARCHAR(10), UNIQUE (b) )

  ENGINE=MyISAM;

CREATE TABLE t2 ( a INT AUTO_INCREMENT, b VARCHAR(10), INDEX (a), INDEX (b) )

  ENGINE=MERGE UNION (t1) INSERT_METHOD=FIRST;

INSERT INTO t2 (b) VALUES (1) ON DUPLICATE KEY UPDATE b=2;

INSERT INTO t2 (b) VALUES (1) ON DUPLICATE KEY UPDATE b=3;

SELECT b FROM t2;

DROP TABLE t1, t2;