diff options
| -rw-r--r-- | mysql-test/suite/pbxt/r/consistent_snapshot.result | 4 | ||||
| -rw-r--r-- | mysql-test/suite/pbxt/r/partition_pruning.result | 4 | ||||
| -rw-r--r-- | mysql-test/suite/pbxt/r/range.result | 20 | ||||
| -rw-r--r-- | mysql-test/suite/pbxt/r/udf.result | 1 | ||||
| -rw-r--r-- | mysql-test/suite/pbxt/t/consistent_snapshot.test | 10 | ||||
| -rw-r--r-- | mysql-test/suite/pbxt/t/partition_pruning.test | 2 | ||||
| -rw-r--r-- | mysql-test/suite/pbxt/t/range.test | 15 | ||||
| -rw-r--r-- | mysql-test/suite/pbxt/t/udf.test | 1 |
8 files changed, 20 insertions, 37 deletions
diff --git a/mysql-test/suite/pbxt/r/consistent_snapshot.result b/mysql-test/suite/pbxt/r/consistent_snapshot.result index 90606abbe4e..97ea9d02386 100644 --- a/mysql-test/suite/pbxt/r/consistent_snapshot.result +++ b/mysql-test/suite/pbxt/r/consistent_snapshot.result @@ -1,4 +1,7 @@ drop table if exists t1; +create table t1 (a int); +insert t1 values (1); +drop table t1; create table t1 (a int) engine=innodb; start transaction with consistent snapshot; insert into t1 values(1); @@ -13,3 +16,4 @@ a 1 commit; drop table t1; +drop database pbxt; diff --git a/mysql-test/suite/pbxt/r/partition_pruning.result b/mysql-test/suite/pbxt/r/partition_pruning.result index e5e75c55ffb..fde864f5329 100644 --- a/mysql-test/suite/pbxt/r/partition_pruning.result +++ b/mysql-test/suite/pbxt/r/partition_pruning.result @@ -533,10 +533,10 @@ Table Op Msg_type Msg_text test.t2 analyze status OK explain partitions select * from t2 where b = 4; id select_type table partitions type possible_keys key key_len ref rows Extra -1 SIMPLE t2 p0,p1,p2,p3,p4 ref b b 5 const 5 +1 SIMPLE t2 p0,p1,p2,p3,p4 ref b b 5 # 5 explain extended select * from t2 where b = 6; id select_type table type possible_keys key key_len ref rows filtered Extra -1 SIMPLE t2 ref b b 5 const 5 100.00 +1 SIMPLE t2 ref b b 5 const # 100.00 Warnings: Note 1003 select `test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b` from `test`.`t2` where (`test`.`t2`.`b` = 6) explain partitions select * from t2 where b = 6; diff --git a/mysql-test/suite/pbxt/r/range.result b/mysql-test/suite/pbxt/r/range.result index 0dac5704d45..bae0b39a8a4 100644 --- a/mysql-test/suite/pbxt/r/range.result +++ b/mysql-test/suite/pbxt/r/range.result @@ -416,26 +416,6 @@ count(*) select count(*) from t2; count(*) 1026 -analyze table t1,t2; -Table Op Msg_type Msg_text -test.t1 analyze status OK -test.t2 analyze status OK -explain select straight_join * from t1, t2 where t1.uid=t2.uid AND t1.uid > 0; -id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range uid_index uid_index 4 NULL # Using where -1 SIMPLE t2 ref uid_index uid_index 4 test.t1.uid # -explain select straight_join * from t1, t2 where t1.uid=t2.uid AND t2.uid > 0; -id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range uid_index uid_index 4 NULL # Using where -1 SIMPLE t2 ref uid_index uid_index 4 test.t1.uid # -explain select straight_join * from t1, t2 where t1.uid=t2.uid AND t1.uid != 0; -id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range uid_index uid_index 4 NULL # Using where -1 SIMPLE t2 ref uid_index uid_index 4 test.t1.uid # -explain select straight_join * from t1, t2 where t1.uid=t2.uid AND t2.uid != 0; -id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range uid_index uid_index 4 NULL # Using where -1 SIMPLE t2 ref uid_index uid_index 4 test.t1.uid # select * from t1, t2 where t1.uid=t2.uid AND t1.uid > 0; id name uid id name uid 1001 A 1 1001 A 1 diff --git a/mysql-test/suite/pbxt/r/udf.result b/mysql-test/suite/pbxt/r/udf.result index 15410ac2039..4bd5272969a 100644 --- a/mysql-test/suite/pbxt/r/udf.result +++ b/mysql-test/suite/pbxt/r/udf.result @@ -315,6 +315,7 @@ CREATE FUNCTION metaphon RETURNS STRING SONAME "UDF_EXAMPLE_LIB"; create table t1 (a char); set GLOBAL query_cache_size=1355776; reset query cache; +flush status; select metaphon('MySQL') from t1; metaphon('MySQL') show status like "Qcache_hits"; diff --git a/mysql-test/suite/pbxt/t/consistent_snapshot.test b/mysql-test/suite/pbxt/t/consistent_snapshot.test index 8da8e9ce660..e2ed9cb5453 100644 --- a/mysql-test/suite/pbxt/t/consistent_snapshot.test +++ b/mysql-test/suite/pbxt/t/consistent_snapshot.test @@ -4,6 +4,14 @@ drop table if exists t1; --enable_warnings +# +# workaround for lp:811438 +# remove when fixed. +# +create table t1 (a int); +insert t1 values (1); +drop table t1; + connect (con1,localhost,root,,); connect (con2,localhost,root,,); @@ -41,3 +49,5 @@ commit; drop table t1; # End of 4.1 tests +drop database pbxt; + diff --git a/mysql-test/suite/pbxt/t/partition_pruning.test b/mysql-test/suite/pbxt/t/partition_pruning.test index 234eb67535e..ad8660e58f7 100644 --- a/mysql-test/suite/pbxt/t/partition_pruning.test +++ b/mysql-test/suite/pbxt/t/partition_pruning.test @@ -463,7 +463,9 @@ explain partitions select * from t2 where (a = 100 OR a = 900); explain partitions select * from t2 where (a > 100 AND a < 600); # PBXT: wait for sweeper analyze table t2; +--replace_column 9 # explain partitions select * from t2 where b = 4; +--replace_column 9 # explain extended select * from t2 where b = 6; explain partitions select * from t2 where b = 6; explain extended select * from t2 where b in (1,3,5); diff --git a/mysql-test/suite/pbxt/t/range.test b/mysql-test/suite/pbxt/t/range.test index 8d02089ee1b..83e3a1e1f51 100644 --- a/mysql-test/suite/pbxt/t/range.test +++ b/mysql-test/suite/pbxt/t/range.test @@ -378,21 +378,6 @@ insert into t2(id, uid, name) select id, uid, name from t1; select count(*) from t1; select count(*) from t2; -analyze table t1,t2; - -# This part doesn't make sense for pbxt as the result may vary becasue -# records_in_range() gives same results for t1 and t2. -# Added straight_join to get predictable results - ---replace_column 9 # -explain select straight_join * from t1, t2 where t1.uid=t2.uid AND t1.uid > 0; ---replace_column 9 # -explain select straight_join * from t1, t2 where t1.uid=t2.uid AND t2.uid > 0; ---replace_column 9 # -explain select straight_join * from t1, t2 where t1.uid=t2.uid AND t1.uid != 0; ---replace_column 9 # -explain select straight_join * from t1, t2 where t1.uid=t2.uid AND t2.uid != 0; - select * from t1, t2 where t1.uid=t2.uid AND t1.uid > 0; select * from t1, t2 where t1.uid=t2.uid AND t1.uid != 0; diff --git a/mysql-test/suite/pbxt/t/udf.test b/mysql-test/suite/pbxt/t/udf.test index addcdef2103..97c2cf8acb4 100644 --- a/mysql-test/suite/pbxt/t/udf.test +++ b/mysql-test/suite/pbxt/t/udf.test @@ -351,6 +351,7 @@ create table t1 (a char); set GLOBAL query_cache_size=1355776; reset query cache; +flush status; select metaphon('MySQL') from t1; show status like "Qcache_hits"; |