summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorunknown <ingo@mysql.com>2005-05-18 19:45:59 +0200
committerunknown <ingo@mysql.com>2005-05-18 19:45:59 +0200
commit7a223fe8c9aaeda48e8b94387c81a3e9fabb74c4 (patch)
treeb0e70aa7318a9bb25f7f3dfecbb124aefda546d6 /mysql-test/r
parentd104149caf5d272a8495e4bd55ec9eaf3015b408 (diff)
parent0461b482cb5151a9d52edc732ac6413e1dc3c000 (diff)
downloadmariadb-git-7a223fe8c9aaeda48e8b94387c81a3e9fabb74c4.tar.gz
Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/merge.result10
1 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result
index 79d8f019ce3..6e14e9a56a8 100644
--- a/mysql-test/r/merge.result
+++ b/mysql-test/r/merge.result
@@ -681,3 +681,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;