diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-02-06 14:50:50 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-02-06 14:50:50 +0100 |
| commit | 4771ae4b22d2bdef0aafc563570c71d4636a2493 (patch) | |
| tree | d115bd7c68b1e6feab68ff6fcd547e0c86c79296 /mysql-test/t/merge.test | |
| parent | 60f51af755ea9d07c20a596ba21de184816fa265 (diff) | |
| parent | 0c25e58db6b045df92c209d396031cac5b528bbf (diff) | |
| download | mariadb-git-4771ae4b22d2bdef0aafc563570c71d4636a2493.tar.gz | |
Merge branch 'github/10.1' into 10.2
Diffstat (limited to 'mysql-test/t/merge.test')
| -rw-r--r-- | mysql-test/t/merge.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test index 09f313616f1..71812b29713 100644 --- a/mysql-test/t/merge.test +++ b/mysql-test/t/merge.test @@ -1559,7 +1559,7 @@ CREATE TABLE m1 ( ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(t1); insert into m1 (col1) values (1); ---error ER_DUP_ENTRY +--error ER_DUP_KEY insert into m1 (col1) values (1); drop table m1, t1; @@ -1593,7 +1593,7 @@ CREATE TABLE t1 (c1 INT, c2 INT, UNIQUE (c1), UNIQUE (c2)); CREATE TABLE m1 (c1 INT, c2 INT, UNIQUE (c1)) ENGINE=MRG_MyISAM INSERT_METHOD=LAST UNION=(t1); INSERT INTO m1 VALUES (1,2); --echo # insert the duplicate value into the merge table ---error ER_DUP_ENTRY +--error ER_DUP_KEY INSERT INTO m1 VALUES (3,2); DROP TABLE m1,t1; |