diff options
author | Sergei Golubchik <sergii@pisem.net> | 2010-10-25 15:21:16 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2010-10-25 15:21:16 +0200 |
commit | 04a4b4334650b2183d25a7b04c1e83c31bffb22d (patch) | |
tree | 587654c186615669df8d81b851db711bb8ac2f62 /mysql-test/t/insert.test | |
parent | 37a78d6868d0e25d286299c91d5787fb6733844d (diff) | |
parent | 60c15066db4f59e0362420d46a1ca5b6fbb30e56 (diff) | |
download | mariadb-git-04a4b4334650b2183d25a7b04c1e83c31bffb22d.tar.gz |
merge with 5.1
Diffstat (limited to 'mysql-test/t/insert.test')
-rw-r--r-- | mysql-test/t/insert.test | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/mysql-test/t/insert.test b/mysql-test/t/insert.test index 5ec0aefe021..045b5807391 100644 --- a/mysql-test/t/insert.test +++ b/mysql-test/t/insert.test @@ -504,3 +504,28 @@ DROP TABLE t1, t2; --echo End of 5.0 tests. + +--echo # +--echo # Bug#54106 assert in Protocol::end_statement, +--echo # INSERT IGNORE ... SELECT ... UNION SELECT ... +--echo # + +--disable_warnings +DROP TABLE IF EXISTS t1; +--enable_warnings + +CREATE TABLE t1 (a INT); + +--error ER_FIELD_SPECIFIED_TWICE +INSERT INTO t1 (a, a) VALUES (1, 1); +# Verify that ER_FIELD_SPECIFIED_TWICE is not ignorable +--error ER_FIELD_SPECIFIED_TWICE +INSERT IGNORE t1 (a, a) VALUES (1, 1); + +--error ER_FIELD_SPECIFIED_TWICE +INSERT IGNORE t1 (a, a) SELECT 1,1; +# Used to cause an assert +--error ER_FIELD_SPECIFIED_TWICE +INSERT IGNORE t1 (a, a) SELECT 1,1 UNION SELECT 2,2; + +DROP TABLE t1; |