diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-11-27 17:46:20 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-11-27 17:46:20 +0100 |
| commit | effed09bd7d8081704eaa017060da84c32e3bf29 (patch) | |
| tree | 9dd712312526cdbac1ab622efcdfc28e3fce965a /mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1.test | |
| parent | 7189f09aa6d434fc889cb6d819e97c09f8cc0bcf (diff) | |
| parent | 12e60c4989ce0214da88faad7c08d2f046885327 (diff) | |
| download | mariadb-git-effed09bd7d8081704eaa017060da84c32e3bf29.tar.gz | |
5.3->5.5 merge
Diffstat (limited to 'mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1.test')
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1.test | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1.test b/mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1.test index f861d8de445..5a0aaa86d4c 100644 --- a/mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1.test +++ b/mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1.test @@ -139,6 +139,7 @@ insert into t1 values (1,1), (2,null), (3,1), (4,1), --echo # used later in the test JT_EQ_REF access method is used. --echo # --vertical_results +--replace_result "Using index condition; Using where" "Using where" explain select 1 from t1 natural join (select 2 as a, 1 as b union all select 2 as a, 2 as b) as t2 for update; @@ -235,6 +236,7 @@ begin; --echo # --echo # Verify that JT_EQ_REF is used. --vertical_results +--replace_result "Using index condition; Using where" "Using where" explain select 1 from t1 natural join (select 3 as a, 2 as b union all select 3 as a, 1 as b) as t2 for update; |