| List: | Commits | « Previous MessageNext Message » | |
| From: | pekka | Date: | October 16 2006 4:13pm |
| Subject: | bk commit into 5.1 tree (pekka:1.2312) | ||
| View as plain text | |||
Below is the list of changes that have just been committed into a local 5.1 repository of pekka. When pekka does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository. For information on how to access the public repository see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html ChangeSet@stripped, 2006-10-16 16:13:03+02:00, pekka@stripped +12 -0 ndb - replace explain 'rows' by '#' in ndb*.test - stats are not deterministic mysql-test/r/ndb_basic.result@stripped, 2006-10-16 16:11:07+02:00, pekka@stripped +1 -1 replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count mysql-test/r/ndb_blob.result@stripped, 2006-10-16 16:11:07+02:00, pekka@stripped +7 -7 replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count mysql-test/r/ndb_charset.result@stripped, 2006-10-16 16:11:07+02:00, pekka@stripped +0 -6 replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count mysql-test/r/ndb_condition_pushdown.result@stripped, 2006-10-16 16:11:07+02:00, pekka@stripped +37 -37 replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count mysql-test/r/ndb_dd_sql_features.result@stripped, 2006-10-16 16:11:07+02:00, pekka@stripped +1 -1 replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count mysql-test/r/ndb_subquery.result@stripped, 2006-10-16 16:11:07+02:00, pekka@stripped +8 -8 replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count mysql-test/t/ndb_basic.test@stripped, 2006-10-16 16:11:08+02:00, pekka@stripped +1 -0 replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count mysql-test/t/ndb_blob.test@stripped, 2006-10-16 16:11:08+02:00, pekka@stripped +7 -0 replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count mysql-test/t/ndb_charset.test@stripped, 2006-10-16 16:11:08+02:00, pekka@stripped +6 -4 replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count mysql-test/t/ndb_condition_pushdown.test@stripped, 2006-10-16 16:11:08+02:00, pekka@stripped +34 -0 replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count mysql-test/t/ndb_dd_sql_features.test@stripped, 2006-10-16 16:11:08+02:00, pekka@stripped +1 -0 replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count mysql-test/t/ndb_subquery.test@stripped, 2006-10-16 16:11:08+02:00, pekka@stripped +4 -0 replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count # This is a BitKeeper patch. What follows are the unified diffs for the # set of deltas contained in the patch. The rest of the patch, the part # that BitKeeper cares about, is below these diffs. # User: pekka # Host: orca.ndb.mysql.com # Root: /export/home/space/pekka/ndb/version/my51-bug21191 --- 1.3/mysql-test/r/ndb_dd_sql_features.result 2006-10-16 16:13:24 +02:00 +++ 1.4/mysql-test/r/ndb_dd_sql_features.result 2006-10-16 16:13:24 +02:00 @@ -441,7 +441,7 @@ INSERT INTO test.t1 values(2,@vc2,@d2); explain SELECT * from test.t1 WHERE a1 = 1; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 const PRIMARY PRIMARY 4 const 1 +1 SIMPLE t1 const PRIMARY PRIMARY 4 const # SELECT a1,length(a2),substr(a2,1+2*900,2),length(a3),substr(a3,1+3*900,3) FROM test.t1 WHERE a1=1 ORDER BY a1; a1 length(a2) substr(a2,1+2*900,2) length(a3) substr(a3,1+3*900,3) --- 1.2/mysql-test/t/ndb_dd_sql_features.test 2006-10-16 16:13:24 +02:00 +++ 1.3/mysql-test/t/ndb_dd_sql_features.test 2006-10-16 16:13:24 +02:00 @@ -480,6 +480,7 @@ INSERT INTO test.t1 values(1,@vc1,@d1); INSERT INTO test.t1 values(2,@vc2,@d2); + --replace_column 9 # explain SELECT * from test.t1 WHERE a1 = 1; SELECT a1,length(a2),substr(a2,1+2*900,2),length(a3),substr(a3,1+3*900,3) --- 1.45/mysql-test/r/ndb_basic.result 2006-10-16 16:13:24 +02:00 +++ 1.46/mysql-test/r/ndb_basic.result 2006-10-16 16:13:24 +02:00 @@ -568,7 +568,7 @@ insert into t1 values (1,1),(2,1),(3,1),(4,1),(5,2),(6,1),(7,1); explain select * from t1 where a12345678901234567890123456789a1234567890=2; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 ref a12345678901234567890123456789a1234567890 a12345678901234567890123456789a1234567890 5 const 1 Using where +1 SIMPLE t1 ref a12345678901234567890123456789a1234567890 a12345678901234567890123456789a1234567890 5 const # Using where select * from t1 where a12345678901234567890123456789a1234567890=2; a1234567890123456789012345678901234567890 a12345678901234567890123456789a1234567890 5 2 --- 1.44/mysql-test/t/ndb_basic.test 2006-10-16 16:13:24 +02:00 +++ 1.45/mysql-test/t/ndb_basic.test 2006-10-16 16:13:24 +02:00 @@ -550,6 +550,7 @@ ) engine=ndb; show tables; insert into t1 values (1,1),(2,1),(3,1),(4,1),(5,2),(6,1),(7,1); +--replace_column 9 # explain select * from t1 where a12345678901234567890123456789a1234567890=2; select * from t1 where a12345678901234567890123456789a1234567890=2; drop table t1; --- 1.29/mysql-test/r/ndb_condition_pushdown.result 2006-10-16 16:13:24 +02:00 +++ 1.30/mysql-test/r/ndb_condition_pushdown.result 2006-10-16 16:13:24 +02:00 @@ -513,7 +513,7 @@ date_time = '1901-01-01 01:01:01' order by auto; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 ALL NULL NULL NULL NULL 4 Using where with pushed condition; Using filesort +1 SIMPLE t1 ALL NULL NULL NULL NULL # Using where with pushed condition; Using filesort select auto from t1 where string = "aaaa" and vstring = "aaaa" and @@ -570,7 +570,7 @@ date_time != '1901-01-01 01:01:01' order by auto; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 ALL NULL NULL NULL NULL 4 Using where with pushed condition; Using filesort +1 SIMPLE t1 ALL NULL NULL NULL NULL # Using where with pushed condition; Using filesort select auto from t1 where string != "aaaa" and vstring != "aaaa" and @@ -629,7 +629,7 @@ date_time > '1901-01-01 01:01:01' order by auto; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 ALL NULL NULL NULL NULL 4 Using where with pushed condition; Using filesort +1 SIMPLE t1 ALL NULL NULL NULL NULL # Using where with pushed condition; Using filesort select auto from t1 where string > "aaaa" and vstring > "aaaa" and @@ -688,7 +688,7 @@ date_time >= '1901-01-01 01:01:01' order by auto; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 ALL NULL NULL NULL NULL 4 Using where with pushed condition; Using filesort +1 SIMPLE t1 ALL NULL NULL NULL NULL # Using where with pushed condition; Using filesort select auto from t1 where string >= "aaaa" and vstring >= "aaaa" and @@ -748,7 +748,7 @@ date_time < '1904-04-04 04:04:04' order by auto; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 ALL NULL NULL NULL NULL 4 Using where with pushed condition; Using filesort +1 SIMPLE t1 ALL NULL NULL NULL NULL # Using where with pushed condition; Using filesort select auto from t1 where string < "dddd" and vstring < "dddd" and @@ -807,7 +807,7 @@ date_time <= '1904-04-04 04:04:04' order by auto; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 ALL NULL NULL NULL NULL 4 Using where with pushed condition; Using filesort +1 SIMPLE t1 ALL NULL NULL NULL NULL # Using where with pushed condition; Using filesort select auto from t1 where string <= "dddd" and vstring <= "dddd" and @@ -868,7 +868,7 @@ date_time = '1901-01-01 01:01:01' order by auto; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 ref medium_index medium_index 3 const 1 Using where with pushed condition; Using filesort +1 SIMPLE t1 ref medium_index medium_index 3 const # Using where with pushed condition; Using filesort select auto from t1 where string = "aaaa" and vstring = "aaaa" and @@ -925,7 +925,7 @@ date_time != '1901-01-01 01:01:01' order by auto; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range medium_index medium_index 3 NULL 3 Using where with pushed condition; Using filesort +1 SIMPLE t1 range medium_index medium_index 3 NULL # Using where with pushed condition; Using filesort select auto from t1 where string != "aaaa" and vstring != "aaaa" and @@ -984,7 +984,7 @@ date_time > '1901-01-01 01:01:01' order by auto; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range medium_index medium_index 3 NULL 3 Using where with pushed condition; Using filesort +1 SIMPLE t1 range medium_index medium_index 3 NULL # Using where with pushed condition; Using filesort select auto from t1 where string > "aaaa" and vstring > "aaaa" and @@ -1043,7 +1043,7 @@ date_time >= '1901-01-01 01:01:01' order by auto; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range medium_index medium_index 3 NULL 4 Using where with pushed condition; Using filesort +1 SIMPLE t1 range medium_index medium_index 3 NULL # Using where with pushed condition; Using filesort select auto from t1 where string >= "aaaa" and vstring >= "aaaa" and @@ -1103,7 +1103,7 @@ date_time < '1904-04-04 04:04:04' order by auto; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range medium_index medium_index 3 NULL 3 Using where with pushed condition; Using filesort +1 SIMPLE t1 range medium_index medium_index 3 NULL # Using where with pushed condition; Using filesort select auto from t1 where string < "dddd" and vstring < "dddd" and @@ -1162,7 +1162,7 @@ date_time <= '1904-04-04 04:04:04' order by auto; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range medium_index medium_index 3 NULL 4 Using where with pushed condition; Using filesort +1 SIMPLE t1 range medium_index medium_index 3 NULL # Using where with pushed condition; Using filesort select auto from t1 where string <= "dddd" and vstring <= "dddd" and @@ -1202,7 +1202,7 @@ vbin like concat(0xBB, '%') order by auto; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 ALL NULL NULL NULL NULL 4 Using where with pushed condition; Using filesort +1 SIMPLE t1 ALL NULL NULL NULL NULL # Using where with pushed condition; Using filesort select auto from t1 where string like "b%" and vstring like "b%" and @@ -1219,7 +1219,7 @@ vbin not like concat(0xBB, '%') order by auto; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 ALL NULL NULL NULL NULL 4 Using where with pushed condition; Using filesort +1 SIMPLE t1 ALL NULL NULL NULL NULL # Using where with pushed condition; Using filesort select auto from t1 where string not like "b%" and vstring not like "b%" and @@ -1255,7 +1255,7 @@ (date_time between '1901-01-01 01:01:01' and '1903-03-03 03:03:03') order by auto; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range medium_index medium_index 3 NULL 3 Using where with pushed condition; Using filesort +1 SIMPLE t1 range medium_index medium_index 3 NULL # Using where with pushed condition; Using filesort select auto from t1 where (string between "aaaa" and "cccc") and (vstring between "aaaa" and "cccc") and @@ -1307,7 +1307,7 @@ ('1901-01-01 01:01:01' between date_time and date_time) order by auto; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range medium_index medium_index 3 NULL 1 Using where with pushed condition; Using filesort +1 SIMPLE t1 range medium_index medium_index 3 NULL # Using where with pushed condition; Using filesort select auto from t1 where ("aaaa" between string and string) and ("aaaa" between vstring and vstring) and @@ -1358,7 +1358,7 @@ (date_time not between '1901-01-01 01:01:01' and '1903-03-03 03:03:03') order by auto; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range medium_index medium_index 3 NULL 1 Using where with pushed condition; Using filesort +1 SIMPLE t1 range medium_index medium_index 3 NULL # Using where with pushed condition; Using filesort select auto from t1 where (string not between "aaaa" and "cccc") and (vstring not between "aaaa" and "cccc") and @@ -1409,7 +1409,7 @@ ('1901-01-01 01:01:01' not between date_time and date_time) order by auto; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range medium_index medium_index 3 NULL 3 Using where with pushed condition; Using filesort +1 SIMPLE t1 range medium_index medium_index 3 NULL # Using where with pushed condition; Using filesort select auto from t1 where ("aaaa" not between string and string) and ("aaaa" not between vstring and vstring) and @@ -1462,7 +1462,7 @@ date_time in('1901-01-01 01:01:01','1903-03-03 03:03:03') order by auto; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range medium_index medium_index 3 NULL 2 Using where with pushed condition; Using filesort +1 SIMPLE t1 range medium_index medium_index 3 NULL # Using where with pushed condition; Using filesort select auto from t1 where string in("aaaa","cccc") and vstring in("aaaa","cccc") and @@ -1514,7 +1514,7 @@ '1901-01-01 01:01:01' in(date_time) order by auto; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 ref medium_index medium_index 3 const 1 Using where with pushed condition; Using filesort +1 SIMPLE t1 ref medium_index medium_index 3 const # Using where with pushed condition; Using filesort select auto from t1 where "aaaa" in(string) and "aaaa" in(vstring) and @@ -1565,7 +1565,7 @@ date_time not in('1901-01-01 01:01:01','1903-03-03 03:03:03') order by auto; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range medium_index medium_index 3 NULL 6 Using where with pushed condition; Using filesort +1 SIMPLE t1 range medium_index medium_index 3 NULL # Using where with pushed condition; Using filesort select auto from t1 where string not in("aaaa","cccc") and vstring not in("aaaa","cccc") and @@ -1617,7 +1617,7 @@ '1901-01-01 01:01:01' not in(date_time) order by auto; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 ALL NULL NULL NULL NULL 4 Using where with pushed condition; Using filesort +1 SIMPLE t1 ALL NULL NULL NULL NULL # Using where with pushed condition; Using filesort select auto from t1 where "aaaa" not in(string) and "aaaa" not in(vstring) and @@ -1704,7 +1704,7 @@ explain select * from t2 where attr3 is null or attr1 > 2 and pk1= 3 order by pk1; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 ALL PRIMARY NULL NULL NULL 6 Using where with pushed condition; Using filesort +1 SIMPLE t2 ALL PRIMARY NULL NULL NULL # Using where with pushed condition; Using filesort select * from t2 where attr3 is null or attr1 > 2 and pk1= 3 order by pk1; pk1 attr1 attr2 attr3 2 2 NULL NULL @@ -1712,7 +1712,7 @@ explain select * from t2 where attr3 is not null and attr1 > 2 order by pk1; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 ALL NULL NULL NULL NULL 6 Using where with pushed condition; Using filesort +1 SIMPLE t2 ALL NULL NULL NULL NULL # Using where with pushed condition; Using filesort select * from t2 where attr3 is not null and attr1 > 2 order by pk1; pk1 attr1 attr2 attr3 3 3 3 d @@ -1721,7 +1721,7 @@ explain select * from t3 where attr2 > 9223372036854775803 and attr3 != 3 order by pk1; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t3 ALL NULL NULL NULL NULL 6 Using where with pushed condition; Using filesort +1 SIMPLE t3 ALL NULL NULL NULL NULL # Using where with pushed condition; Using filesort select * from t3 where attr2 > 9223372036854775803 and attr3 != 3 order by pk1; pk1 attr1 attr2 attr3 attr4 2 2 9223372036854775804 2 c @@ -1730,15 +1730,15 @@ explain select * from t2,t3 where t2.attr1 < 1 and t2.attr2 = t3.attr2 and t3.attr1 < 5 order by t2.pk1; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 ALL NULL NULL NULL NULL 6 Using where with pushed condition; Using temporary; Using filesort -1 SIMPLE t3 ALL NULL NULL NULL NULL 6 Using where with pushed condition +1 SIMPLE t2 ALL NULL NULL NULL NULL # Using where with pushed condition; Using temporary; Using filesort +1 SIMPLE t3 ALL NULL NULL NULL NULL # Using where with pushed condition select * from t2,t3 where t2.attr1 < 1 and t2.attr2 = t3.attr2 and t3.attr1 < 5 order by t2.pk1; pk1 attr1 attr2 attr3 pk1 attr1 attr2 attr3 attr4 0 0 0 a 0 0 0 0 a explain select * from t4 where attr1 < 5 and attr2 > 9223372036854775803 and attr3 != 3 order by t4.pk1; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t4 range attr1 attr1 4 NULL 5 Using where with pushed condition; Using filesort +1 SIMPLE t4 range attr1 attr1 4 NULL # Using where with pushed condition; Using filesort select * from t4 where attr1 < 5 and attr2 > 9223372036854775803 and attr3 != 3 order by t4.pk1; pk1 attr1 attr2 attr3 attr4 2 2 9223372036854775804 2 c @@ -1746,8 +1746,8 @@ explain select * from t3,t4 where t4.attr1 > 1 and t4.attr2 = t3.attr2 and t4.attr3 < 5 order by t4.pk1; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t4 range attr1 attr1 4 NULL 4 Using where with pushed condition; Using temporary; Using filesort -1 SIMPLE t3 ALL NULL NULL NULL NULL 6 Using where +1 SIMPLE t4 range attr1 attr1 4 NULL # Using where with pushed condition; Using temporary; Using filesort +1 SIMPLE t3 ALL NULL NULL NULL NULL # Using where select * from t3,t4 where t4.attr1 > 1 and t4.attr2 = t3.attr2 and t4.attr3 < 5 order by t4.pk1; pk1 attr1 attr2 attr3 attr4 pk1 attr1 attr2 attr3 attr4 2 2 9223372036854775804 2 c 2 2 9223372036854775804 2 c @@ -1756,16 +1756,16 @@ explain select auto from t1 where string = "aaaa" collate latin1_general_ci order by auto; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 ALL NULL NULL NULL NULL 3 Using where; Using filesort +1 SIMPLE t1 ALL NULL NULL NULL NULL # Using where; Using filesort explain select * from t2 where (attr1 < 2) = (attr2 < 2) order by pk1; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 ALL NULL NULL NULL NULL 6 Using where; Using filesort +1 SIMPLE t2 ALL NULL NULL NULL NULL # Using where; Using filesort explain select * from t3 left join t4 on t4.attr2 = t3.attr2 where t4.attr1 > 1 and t4.attr3 < 5 or t4.attr1 is null order by t4.pk1; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t3 ALL NULL NULL NULL NULL 6 Using temporary; Using filesort -1 SIMPLE t4 ALL NULL NULL NULL NULL 6 Using where +1 SIMPLE t3 ALL NULL NULL NULL NULL # Using temporary; Using filesort +1 SIMPLE t4 ALL NULL NULL NULL NULL # Using where create table t5 (a int primary key auto_increment, b tinytext not null) engine = ndb; insert into t5 (b) values ('jonas'), ('jensing'), ('johan'); @@ -1777,7 +1777,7 @@ set engine_condition_pushdown = on; explain select * from t5 where b like '%jo%'; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t5 ALL NULL NULL NULL NULL 3 Using where +1 SIMPLE t5 ALL NULL NULL NULL NULL # Using where select * from t5 where b like '%jo%' order by a; a b 1 jonas @@ -1793,13 +1793,13 @@ set engine_condition_pushdown = on; explain select auto from t1 where date_time like '1902-02-02 %'; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 ALL NULL NULL NULL NULL 3 Using where +1 SIMPLE t1 ALL NULL NULL NULL NULL # Using where select auto from t1 where date_time like '1902-02-02 %' order by auto; auto 2 explain select auto from t1 where date_time not like '1902-02-02 %'; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 ALL NULL NULL NULL NULL 3 Using where +1 SIMPLE t1 ALL NULL NULL NULL NULL # Using where select auto from t1 where date_time not like '1902-02-02 %' order by auto; auto 3 --- 1.22/mysql-test/t/ndb_condition_pushdown.test 2006-10-16 16:13:24 +02:00 +++ 1.23/mysql-test/t/ndb_condition_pushdown.test 2006-10-16 16:13:24 +02:00 @@ -456,6 +456,7 @@ set engine_condition_pushdown = on; # Test all types and compare operators +--replace_column 9 # explain select auto from t1 where string = "aaaa" and @@ -511,6 +512,7 @@ date_time = '1901-01-01 01:01:01' order by auto; +--replace_column 9 # explain select auto from t1 where string != "aaaa" and @@ -566,6 +568,7 @@ date_time != '1901-01-01 01:01:01' order by auto; +--replace_column 9 # explain select auto from t1 where string > "aaaa" and @@ -621,6 +624,7 @@ date_time > '1901-01-01 01:01:01' order by auto; +--replace_column 9 # explain select auto from t1 where string >= "aaaa" and @@ -676,6 +680,7 @@ date_time >= '1901-01-01 01:01:01' order by auto; +--replace_column 9 # explain select auto from t1 where string < "dddd" and @@ -731,6 +736,7 @@ date_time < '1904-04-04 04:04:04' order by auto; +--replace_column 9 # explain select auto from t1 where string <= "dddd" and @@ -790,6 +796,7 @@ create index medium_index on t1(medium); # Test all types and compare operators +--replace_column 9 # explain select auto from t1 where string = "aaaa" and @@ -845,6 +852,7 @@ date_time = '1901-01-01 01:01:01' order by auto; +--replace_column 9 # explain select auto from t1 where string != "aaaa" and @@ -900,6 +908,7 @@ date_time != '1901-01-01 01:01:01' order by auto; +--replace_column 9 # explain select auto from t1 where string > "aaaa" and @@ -955,6 +964,7 @@ date_time > '1901-01-01 01:01:01' order by auto; +--replace_column 9 # explain select auto from t1 where string >= "aaaa" and @@ -1010,6 +1020,7 @@ date_time >= '1901-01-01 01:01:01' order by auto; +--replace_column 9 # explain select auto from t1 where string < "dddd" and @@ -1065,6 +1076,7 @@ date_time < '1904-04-04 04:04:04' order by auto; +--replace_column 9 # explain select auto from t1 where string <= "dddd" and @@ -1121,6 +1133,7 @@ order by auto; # Test LIKE/NOT LIKE +--replace_column 9 # explain select auto from t1 where string like "b%" and @@ -1136,6 +1149,7 @@ vbin like concat(0xBB, '%') order by auto; +--replace_column 9 # explain select auto from t1 where string not like "b%" and @@ -1152,6 +1166,7 @@ order by auto; # BETWEEN +--replace_column 9 # explain select auto from t1 where (string between "aaaa" and "cccc") and @@ -1201,6 +1216,7 @@ (date_time between '1901-01-01 01:01:01' and '1903-03-03 03:03:03') order by auto; +--replace_column 9 # explain select auto from t1 where ("aaaa" between string and string) and @@ -1251,6 +1267,7 @@ order by auto; # NOT BETWEEN +--replace_column 9 # explain select auto from t1 where (string not between "aaaa" and "cccc") and @@ -1300,6 +1317,7 @@ (date_time not between '1901-01-01 01:01:01' and '1903-03-03 03:03:03') order by auto; +--replace_column 9 # explain select auto from t1 where ("aaaa" not between string and string) and @@ -1350,6 +1368,7 @@ order by auto; # IN +--replace_column 9 # explain select auto from t1 where string in("aaaa","cccc") and @@ -1399,6 +1418,7 @@ date_time in('1901-01-01 01:01:01','1903-03-03 03:03:03') order by auto; +--replace_column 9 # explain select auto from t1 where "aaaa" in(string) and @@ -1449,6 +1469,7 @@ order by auto; # NOT IN +--replace_column 9 # explain select auto from t1 where string not in("aaaa","cccc") and @@ -1498,6 +1519,7 @@ date_time not in('1901-01-01 01:01:01','1903-03-03 03:03:03') order by auto; +--replace_column 9 # explain select auto from t1 where "aaaa" not in(string) and @@ -1607,35 +1629,44 @@ select count(*) from t1; # Various tests +--replace_column 9 # explain select * from t2 where attr3 is null or attr1 > 2 and pk1= 3 order by pk1; select * from t2 where attr3 is null or attr1 > 2 and pk1= 3 order by pk1; +--replace_column 9 # explain select * from t2 where attr3 is not null and attr1 > 2 order by pk1; select * from t2 where attr3 is not null and attr1 > 2 order by pk1; +--replace_column 9 # explain select * from t3 where attr2 > 9223372036854775803 and attr3 != 3 order by pk1; select * from t3 where attr2 > 9223372036854775803 and attr3 != 3 order by pk1; +--replace_column 9 # explain select * from t2,t3 where t2.attr1 < 1 and t2.attr2 = t3.attr2 and t3.attr1 < 5 order by t2.pk1; select * from t2,t3 where t2.attr1 < 1 and t2.attr2 = t3.attr2 and t3.attr1 < 5 order by t2.pk1; +--replace_column 9 # explain select * from t4 where attr1 < 5 and attr2 > 9223372036854775803 and attr3 != 3 order by t4.pk1; select * from t4 where attr1 < 5 and attr2 > 9223372036854775803 and attr3 != 3 order by t4.pk1; +--replace_column 9 # explain select * from t3,t4 where t4.attr1 > 1 and t4.attr2 = t3.attr2 and t4.attr3 < 5 order by t4.pk1; select * from t3,t4 where t4.attr1 > 1 and t4.attr2 = t3.attr2 and t4.attr3 < 5 order by t4.pk1; # Some tests that are currently not supported and should not push condition +--replace_column 9 # explain select auto from t1 where string = "aaaa" collate latin1_general_ci order by auto; +--replace_column 9 # explain select * from t2 where (attr1 < 2) = (attr2 < 2) order by pk1; +--replace_column 9 # explain select * from t3 left join t4 on t4.attr2 = t3.attr2 where t4.attr1 > 1 and t4.attr3 < 5 or t4.attr1 is null order by t4.pk1; @@ -1646,6 +1677,7 @@ set engine_condition_pushdown = off; select * from t5 where b like '%jo%' order by a; set engine_condition_pushdown = on; +--replace_column 9 # explain select * from t5 where b like '%jo%'; select * from t5 where b like '%jo%' order by a; @@ -1654,8 +1686,10 @@ select auto from t1 where date_time like '1902-02-02 %' order by auto; select auto from t1 where date_time not like '1902-02-02 %' order by auto; set engine_condition_pushdown = on; +--replace_column 9 # explain select auto from t1 where date_time like '1902-02-02 %'; select auto from t1 where date_time like '1902-02-02 %' order by auto; +--replace_column 9 # explain select auto from t1 where date_time not like '1902-02-02 %'; select auto from t1 where date_time not like '1902-02-02 %' order by auto; --- 1.19/mysql-test/r/ndb_blob.result 2006-10-16 16:13:24 +02:00 +++ 1.20/mysql-test/r/ndb_blob.result 2006-10-16 16:13:24 +02:00 @@ -40,7 +40,7 @@ commit; explain select * from t1 where a = 1; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 const PRIMARY PRIMARY 4 const 1 +1 SIMPLE t1 const PRIMARY PRIMARY 4 const # select a,length(b),substr(b,1+2*900,2),length(d),substr(d,1+3*900,3) from t1 where a=1; a length(b) substr(b,1+2*900,2) length(d) substr(d,1+3*900,3) @@ -87,7 +87,7 @@ commit; explain select * from t1 where a = 1; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 const PRIMARY PRIMARY 4 const 1 +1 SIMPLE t1 const PRIMARY PRIMARY 4 const # select a,length(b),substr(b,1+2*900,2),length(d),substr(d,1+3*900,3) from t1 where a=1; a length(b) substr(b,1+2*900,2) length(d) substr(d,1+3*900,3) @@ -134,7 +134,7 @@ commit; explain select * from t1 where c = 111; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 ref c c 4 const 1 +1 SIMPLE t1 ref c c 4 const # select a,length(b),substr(b,1+2*900,2),length(d),substr(d,1+3*900,3) from t1 where c=111; a length(b) substr(b,1+2*900,2) length(d) substr(d,1+3*900,3) @@ -177,7 +177,7 @@ commit; explain select * from t1; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 ALL NULL NULL NULL NULL 9 +1 SIMPLE t1 ALL NULL NULL NULL NULL # select * from t1 order by a; a b c d 1 b1 111 dd1 @@ -212,7 +212,7 @@ commit; explain select * from t1; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 ALL NULL NULL NULL NULL 2 +1 SIMPLE t1 ALL NULL NULL NULL NULL # select a,length(b),substr(b,1+2*900,2),length(d),substr(d,1+3*900,3) from t1 order by a; a length(b) substr(b,1+2*900,2) length(d) substr(d,1+3*900,3) @@ -242,7 +242,7 @@ commit; explain select * from t1 where c >= 100 order by a; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range c c 4 NULL 9 Using where; Using filesort +1 SIMPLE t1 range c c 4 NULL # Using where; Using filesort select * from t1 where c >= 100 order by a; a b c d 1 b1 111 dd1 @@ -278,7 +278,7 @@ commit; explain select * from t1 where c >= 100 order by a; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range c c 4 NULL 2 Using where; Using filesort +1 SIMPLE t1 range c c 4 NULL # Using where; Using filesort select a,length(b),substr(b,1+2*900,2),length(d),substr(d,1+3*900,3) from t1 where c >= 100 order by a; a length(b) substr(b,1+2*900,2) length(d) substr(d,1+3*900,3) --- 1.10/mysql-test/r/ndb_charset.result 2006-10-16 16:13:24 +02:00 +++ 1.11/mysql-test/r/ndb_charset.result 2006-10-16 16:13:24 +02:00 @@ -186,9 +186,6 @@ 4 aAa 5 aaa 6 AAA -explain select * from t1 where a = 'zZz' order by p; -id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 const a NULL NULL NULL 1 select * from t1 where a = 'aAa' order by p; p a 1 aAa @@ -223,9 +220,6 @@ 4 aAa 5 aaa 6 AAA -explain select * from t1 where a = 'zZz' order by p; -id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 const a NULL NULL NULL 1 select * from t1 where a = 'aAa' order by p; p a 1 aAa --- 1.18/mysql-test/t/ndb_blob.test 2006-10-16 16:13:24 +02:00 +++ 1.19/mysql-test/t/ndb_blob.test 2006-10-16 16:13:24 +02:00 @@ -65,6 +65,7 @@ insert into t1 values(1,@b1,111,@d1); insert into t1 values(2,@b2,222,@d2); commit; +--replace_column 9 # explain select * from t1 where a = 1; # pk read @@ -108,6 +109,7 @@ replace t1 set a=1,b=@b1,c=111,d=@d1; replace t1 set a=2,b=@b2,c=222,d=@d2; commit; +--replace_column 9 # explain select * from t1 where a = 1; # pk read @@ -150,6 +152,7 @@ insert into t1 values(1,@b1,111,@d1); insert into t1 values(2,@b2,222,@d2); commit; +--replace_column 9 # explain select * from t1 where c = 111; # hash key read @@ -190,6 +193,7 @@ insert into t1 values(8,'b8',888,'dd8'); insert into t1 values(9,'b9',999,'dd9'); commit; +--replace_column 9 # explain select * from t1; # table scan read @@ -210,6 +214,7 @@ insert into t1 values(1,@b1,111,@d1); insert into t1 values(2,@b2,222,@d2); commit; +--replace_column 9 # explain select * from t1; # table scan read @@ -239,6 +244,7 @@ insert into t1 values(8,'b8',888,'dd8'); insert into t1 values(9,'b9',999,'dd9'); commit; +--replace_column 9 # explain select * from t1 where c >= 100 order by a; # range scan read @@ -260,6 +266,7 @@ insert into t1 values(1,@b1,111,@d1); insert into t1 values(2,@b2,222,@d2); commit; +--replace_column 9 # explain select * from t1 where c >= 100 order by a; # range scan read --- 1.11/mysql-test/t/ndb_charset.test 2006-10-16 16:13:24 +02:00 +++ 1.12/mysql-test/t/ndb_charset.test 2006-10-16 16:13:24 +02:00 @@ -159,8 +159,9 @@ insert into t1 values(6, 'AAA'); # 6 select * from t1 order by p; -# plan -explain select * from t1 where a = 'zZz' order by p; +# plan too flaky +#--replace_column 9 # +#explain select * from t1 where a = 'zZz' order by p; # 2 select * from t1 where a = 'aAa' order by p; # 2 @@ -187,8 +188,9 @@ insert into t1 values(6, 'AAA'); # 6 select * from t1 order by p; -# plan -explain select * from t1 where a = 'zZz' order by p; +# plan too flaky +#--replace_column 9 # +#explain select * from t1 where a = 'zZz' order by p; # 6 select * from t1 where a = 'aAa' order by p; # 6 --- 1.3/mysql-test/r/ndb_subquery.result 2006-10-16 16:13:24 +02:00 +++ 1.4/mysql-test/r/ndb_subquery.result 2006-10-16 16:13:24 +02:00 @@ -8,32 +8,32 @@ insert into t2 values (1,1,1),(2,2,2),(3,3,3), (4,4,4), (5,5,5); explain select * from t2 where p NOT IN (select p from t1); id select_type table type possible_keys key key_len ref rows Extra -1 PRIMARY t2 ALL NULL NULL NULL NULL 5 Using where -2 DEPENDENT SUBQUERY t1 unique_subquery PRIMARY PRIMARY 4 func 1 Using index +1 PRIMARY t2 ALL NULL NULL NULL NULL # Using where +2 DEPENDENT SUBQUERY t1 unique_subquery PRIMARY PRIMARY 4 func # Using index select * from t2 where p NOT IN (select p from t1) order by p; p u o 4 4 4 5 5 5 explain select * from t2 where p NOT IN (select u from t1); id select_type table type possible_keys key key_len ref rows Extra -1 PRIMARY t2 ALL NULL NULL NULL NULL 5 Using where -2 DEPENDENT SUBQUERY t1 unique_subquery u u 4 func 1 Using index +1 PRIMARY t2 ALL NULL NULL NULL NULL # Using where +2 DEPENDENT SUBQUERY t1 unique_subquery u u 4 func # Using index select * from t2 where p NOT IN (select u from t1) order by p; p u o 4 4 4 5 5 5 explain select * from t2 where p NOT IN (select o from t1); id select_type table type possible_keys key key_len ref rows Extra -1 PRIMARY t2 ALL NULL NULL NULL NULL 5 Using where -2 DEPENDENT SUBQUERY t1 index_subquery o o 4 func 1 Using index +1 PRIMARY t2 ALL NULL NULL NULL NULL # Using where +2 DEPENDENT SUBQUERY t1 index_subquery o o 4 func # Using index select * from t2 where p NOT IN (select o from t1) order by p; p u o 4 4 4 5 5 5 explain select * from t2 where p NOT IN (select p+0 from t1); id select_type table type possible_keys key key_len ref rows Extra -1 PRIMARY t2 ALL NULL NULL NULL NULL 5 Using where -2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 3 Using where +1 PRIMARY t2 ALL NULL NULL NULL NULL # Using where +2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL # Using where select * from t2 where p NOT IN (select p+0 from t1) order by p; p u o 4 4 4 --- 1.5/mysql-test/t/ndb_subquery.test 2006-10-16 16:13:24 +02:00 +++ 1.6/mysql-test/t/ndb_subquery.test 2006-10-16 16:13:24 +02:00 @@ -18,18 +18,22 @@ insert into t2 values (1,1,1),(2,2,2),(3,3,3), (4,4,4), (5,5,5); # Use pk +--replace_column 9 # explain select * from t2 where p NOT IN (select p from t1); select * from t2 where p NOT IN (select p from t1) order by p; # Use unique index +--replace_column 9 # explain select * from t2 where p NOT IN (select u from t1); select * from t2 where p NOT IN (select u from t1) order by p; # Use ordered index +--replace_column 9 # explain select * from t2 where p NOT IN (select o from t1); select * from t2 where p NOT IN (select o from t1) order by p; # Use scan +--replace_column 9 # explain select * from t2 where p NOT IN (select p+0 from t1); select * from t2 where p NOT IN (select p+0 from t1) order by p;
| Thread | ||
|---|---|---|
| • bk commit into 5.1 tree (pekka:1.2312) | pekka | 16 Oct |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.704 sec. using MySQL 5.1.14-beta-log