diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-02-20 11:12:06 +0200 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-02-20 11:12:06 +0200 |
| commit | a67725ac75ded8d6f4f9eb8dac4c23fc03e82738 (patch) | |
| tree | 906a8e7ed51b2a981c0073e62ca7fd487c57b64f /mysql-test/r/innodb_mysql.result | |
| parent | cf42f6689fd52da07fd6588d2aaded1f0f39abae (diff) | |
| download | mariadb-git-a67725ac75ded8d6f4f9eb8dac4c23fc03e82738.tar.gz | |
Bug #42419: test suite fix
Moved the test case for the bug into a separate file (and restored the
original innodb_mysql test setup).
Used the new wait_show_condition test macro to avoid the usage of sleep
mysql-test/include/wait_show_condition.inc:
Bug #42419: new test macro to wait for a row in SHOW to have a certain value.
mysql-test/r/innodb_bug42419.result:
Bug #42419: test case
mysql-test/r/innodb_mysql.result:
Bug #42419: revert to the original innodb_mysql test
mysql-test/t/innodb_bug42419.test:
Bug #42419: test case
mysql-test/t/innodb_mysql-master.opt:
Bug #42419: revert to the original innodb_mysql test
mysql-test/t/innodb_mysql.test:
Bug #42419: revert to the original innodb_mysql test
Diffstat (limited to 'mysql-test/r/innodb_mysql.result')
| -rw-r--r-- | mysql-test/r/innodb_mysql.result | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/mysql-test/r/innodb_mysql.result b/mysql-test/r/innodb_mysql.result index 78a56cddb08..682cc2e82e2 100644 --- a/mysql-test/r/innodb_mysql.result +++ b/mysql-test/r/innodb_mysql.result @@ -1267,20 +1267,4 @@ CREATE INDEX i1 on t1 (a(3)); SELECT * FROM t1 WHERE a = 'abcde'; a DROP TABLE t1; -CREATE TABLE t1 (a INT NOT NULL AUTO_INCREMENT PRIMARY KEY, b INT) -ENGINE=InnoDB; -INSERT INTO t1 VALUES (1,1),(2,2),(3,3); -SET AUTOCOMMIT = 0; -CREATE TEMPORARY TABLE t1_tmp (b INT); -INSERT INTO t1_tmp SELECT b FROM t1 WHERE a = 3; -INSERT INTO t1_tmp SELECT b FROM t1 WHERE a = 2; -SET AUTOCOMMIT = 0; -CREATE TEMPORARY TABLE t2_tmp ( a INT, new_a INT); -INSERT INTO t2_tmp VALUES (1,51),(2,52),(3,53); -UPDATE t1 SET a = (SELECT new_a FROM t2_tmp WHERE t2_tmp.a = t1.a) WHERE a = 1; -UPDATE t1 SET a = (SELECT new_a FROM t2_tmp WHERE t2_tmp.a = t1.a) WHERE a = 2; -INSERT INTO t1_tmp SELECT b FROM t1 WHERE a = 1; -ERROR 40001: Deadlock found when trying to get lock; try restarting transaction -UPDATE t1 SET a = (SELECT new_a FROM t2_tmp WHERE t2_tmp.a = t1.a) WHERE a = 3; -DROP TABLE t1; End of 5.0 tests |