diff options
author | Sergei Golubchik <sergii@pisem.net> | 2013-04-15 15:09:22 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2013-04-15 15:09:22 +0200 |
commit | a9035be5b7a7b3865ddb4ef34a5d0cfc65dfc254 (patch) | |
tree | a9df7341e91623f62fe37cd47fce139d8888fc95 /mysql-test/suite/storage_engine/delete_ignore.test | |
parent | 3a1c91d87d69ef243b3e78be6089102cafef0a8e (diff) | |
parent | f57ecb7786177e0af3b1e3ec94302720b2e0f967 (diff) | |
download | mariadb-git-a9035be5b7a7b3865ddb4ef34a5d0cfc65dfc254.tar.gz |
10.0-base merge
Diffstat (limited to 'mysql-test/suite/storage_engine/delete_ignore.test')
-rw-r--r-- | mysql-test/suite/storage_engine/delete_ignore.test | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/suite/storage_engine/delete_ignore.test b/mysql-test/suite/storage_engine/delete_ignore.test index fa98ec92029..c1b1926db45 100644 --- a/mysql-test/suite/storage_engine/delete_ignore.test +++ b/mysql-test/suite/storage_engine/delete_ignore.test @@ -18,9 +18,9 @@ INSERT INTO t1 (a,b) SELECT a, b FROM t1; --source create_table.inc INSERT INTO t2 (c,d) SELECT b, a FROM t1; --sorted_result -SELECT * FROM t1; +SELECT a,b FROM t1; --sorted_result -SELECT * FROM t2; +SELECT c,d FROM t2; DELETE IGNORE FROM t1 WHERE b IS NOT NULL ORDER BY a LIMIT 1; if ($mysql_errname) @@ -29,13 +29,13 @@ if ($mysql_errname) --source unexpected_result.inc } --sorted_result -SELECT * FROM t1; +SELECT a,b FROM t1; DELETE IGNORE t1.*, t2.* FROM t1, t2 WHERE c < b OR a != ( SELECT 1 UNION SELECT 2 ); --sorted_result -SELECT * FROM t1; +SELECT a,b FROM t1; --sorted_result -SELECT * FROM t2; +SELECT c,d FROM t2; # Cleanup DROP TABLE t1, t2; |