database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

5.3->5.5 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2011-11-27 17:46:20 +01:00
parent 7189f09aa6 12e60c4989
commit effed09bd7
119 changed files with 10421 additions and 890 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1.test
View File

@ -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;