summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/include/have_xtradb.combinations2
-rw-r--r--mysql-test/include/rpl_udf.inc1
-rw-r--r--mysql-test/lib/mtr_cases.pm4
-rw-r--r--mysql-test/r/information_schema_all_engines.result8
-rw-r--r--mysql-test/r/innodb_icp,innodb_plugin.rdiff80
-rw-r--r--mysql-test/r/innodb_mrr_cpk,innodb_plugin.rdiff10
-rw-r--r--mysql-test/r/plugin_innodb,innodb_plugin.rdiff12
-rw-r--r--mysql-test/r/range_vs_index_merge_innodb,innodb_plugin.rdiff87
-rw-r--r--mysql-test/suite/percona/percona_flush_contiguous_neighbors.test2
-rw-r--r--mysql-test/suite/percona/percona_sync_flush.test2
-rw-r--r--mysql-test/suite/rpl/t/rpl_udf.test2
11 files changed, 48 insertions, 162 deletions
diff --git a/mysql-test/include/have_xtradb.combinations b/mysql-test/include/have_xtradb.combinations
index b82edc53aee..b42b72e5785 100644
--- a/mysql-test/include/have_xtradb.combinations
+++ b/mysql-test/include/have_xtradb.combinations
@@ -4,10 +4,12 @@ plugin-load=$HA_XTRADB_SO
innodb
innodb-cmpmem
innodb-trx
+innodb-sys-index
xtradb-admin-command
[xtradb]
innodb
innodb-cmpmem
innodb-trx
+innodb-sys-index
xtradb-admin-command
diff --git a/mysql-test/include/rpl_udf.inc b/mysql-test/include/rpl_udf.inc
index fc85a6da8c7..658ec3b355a 100644
--- a/mysql-test/include/rpl_udf.inc
+++ b/mysql-test/include/rpl_udf.inc
@@ -9,6 +9,7 @@
#####################################################################
--source include/have_udf.inc
+--source include/master-slave.inc
#
# To run this tests the "sql/udf_example.c" need to be compiled into
diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm
index 11c8b2a6b35..beb0716d4a7 100644
--- a/mysql-test/lib/mtr_cases.pm
+++ b/mysql-test/lib/mtr_cases.pm
@@ -333,7 +333,7 @@ sub collect_one_suite
}
else
{
- @overlays = my_find_dir($::basedir,
+ @overlays = my_find_dir(dirname($::glob_mysql_test_dir),
["mysql-test/suite",
"storage/*/mysql-test",
"plugin/*/mysql-test"],
@@ -354,7 +354,7 @@ sub collect_one_suite
$suitedir = shift @overlays;
}
} else {
- @overlays = my_find_dir($::basedir,
+ @overlays = my_find_dir(dirname($::glob_mysql_test_dir),
["storage/*/mysql-test",
"plugin/*/mysql-test"],
['main'], NOT_REQUIRED);
diff --git a/mysql-test/r/information_schema_all_engines.result b/mysql-test/r/information_schema_all_engines.result
index be2b2360094..9304febcc5a 100644
--- a/mysql-test/r/information_schema_all_engines.result
+++ b/mysql-test/r/information_schema_all_engines.result
@@ -15,6 +15,7 @@ GLOBAL_VARIABLES
INDEX_STATISTICS
INNODB_CMPMEM
INNODB_LOCKS
+INNODB_SYS_INDEXES
INNODB_TRX
KEY_CACHES
KEY_COLUMN_USAGE
@@ -69,6 +70,7 @@ GLOBAL_VARIABLES VARIABLE_NAME
INDEX_STATISTICS TABLE_SCHEMA
INNODB_CMPMEM page_size
INNODB_LOCKS lock_id
+INNODB_SYS_INDEXES INDEX_ID
INNODB_TRX trx_id
KEY_CACHES KEY_CACHE_NAME
KEY_COLUMN_USAGE CONSTRAINT_SCHEMA
@@ -123,6 +125,7 @@ GLOBAL_VARIABLES VARIABLE_NAME
INDEX_STATISTICS TABLE_SCHEMA
INNODB_CMPMEM page_size
INNODB_LOCKS lock_id
+INNODB_SYS_INDEXES INDEX_ID
INNODB_TRX trx_id
KEY_CACHES KEY_CACHE_NAME
KEY_COLUMN_USAGE CONSTRAINT_SCHEMA
@@ -183,6 +186,7 @@ GLOBAL_VARIABLES information_schema.GLOBAL_VARIABLES 1
INDEX_STATISTICS information_schema.INDEX_STATISTICS 1
INNODB_CMPMEM information_schema.INNODB_CMPMEM 1
INNODB_LOCKS information_schema.INNODB_LOCKS 1
+INNODB_SYS_INDEXES information_schema.INNODB_SYS_INDEXES 1
INNODB_TRX information_schema.INNODB_TRX 1
KEY_CACHES information_schema.KEY_CACHES 1
KEY_COLUMN_USAGE information_schema.KEY_COLUMN_USAGE 1
@@ -226,6 +230,7 @@ Database: information_schema
| INDEX_STATISTICS |
| INNODB_CMPMEM |
| INNODB_LOCKS |
+| INNODB_SYS_INDEXES |
| INNODB_TRX |
| KEY_CACHES |
| KEY_COLUMN_USAGE |
@@ -270,6 +275,7 @@ Database: INFORMATION_SCHEMA
| INDEX_STATISTICS |
| INNODB_CMPMEM |
| INNODB_LOCKS |
+| INNODB_SYS_INDEXES |
| INNODB_TRX |
| KEY_CACHES |
| KEY_COLUMN_USAGE |
@@ -303,5 +309,5 @@ Wildcard: inf_rmation_schema
| information_schema |
SELECT table_schema, count(*) FROM information_schema.TABLES WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test', 'mysqltest') AND table_name<>'ndb_binlog_index' AND table_name<>'ndb_apply_status' GROUP BY TABLE_SCHEMA;
table_schema count(*)
-information_schema 39
+information_schema 40
mysql 23
diff --git a/mysql-test/r/innodb_icp,innodb_plugin.rdiff b/mysql-test/r/innodb_icp,innodb_plugin.rdiff
index bf598d64cd5..08e16944fba 100644
--- a/mysql-test/r/innodb_icp,innodb_plugin.rdiff
+++ b/mysql-test/r/innodb_icp,innodb_plugin.rdiff
@@ -1,14 +1,5 @@
---- r/innodb_icp.result 2012-01-09 16:13:21.000000000 +0100
-+++ r/innodb_icp.reject 2012-02-07 12:45:59.000000000 +0100
-@@ -167,7 +167,7 @@
- ORDER BY ts DESC
- LIMIT 2;
- id select_type table type possible_keys key key_len ref rows Extra
--1 SIMPLE t1 range PRIMARY PRIMARY 4 NULL 4 Using index condition
-+1 SIMPLE t1 range PRIMARY PRIMARY 4 NULL 4 Using where
-
- DROP TABLE t1;
- #
+--- r/innodb_icp.result 2012-02-25 17:31:11.000000000 +0100
++++ /usr/home/serg/Abk/mysql/5.5-mtr/mysql-test/r/innodb_icp,innodb_plugin.reject 2012-02-25 22:32:18.000000000 +0100
@@ -213,7 +213,7 @@
EXPLAIN
SELECT c1 FROM t3 WHERE c1 >= 'c-1004=w' and c1 <= 'c-1006=w' and i1 > 2;
@@ -18,35 +9,6 @@
SELECT c1 FROM t3 WHERE c1 >= 'c-1004=w' and c1 <= 'c-1006=w' and i1 > 2;
c1
EXPLAIN
-@@ -431,7 +431,7 @@
- WHERE pk IN (SELECT it.pk FROM t2 JOIN t2 AS it ON it.i=it.i WHERE it.pk-t1.i<10);
- id select_type table type possible_keys key key_len ref rows Extra
- 1 PRIMARY t1 ALL NULL NULL NULL NULL 3 Using where
--2 DEPENDENT SUBQUERY it eq_ref PRIMARY PRIMARY 4 func 1 Using index condition
-+2 DEPENDENT SUBQUERY it eq_ref PRIMARY PRIMARY 4 func 1 Using where
- 2 DEPENDENT SUBQUERY t2 index NULL PRIMARY 4 NULL 3 Using where; Using index; Using join buffer (flat, BNL join)
- SELECT * FROM t1
- WHERE pk IN (SELECT it.pk FROM t2 JOIN t2 AS it ON it.i=it.i WHERE it.pk-t1.i<10);
-@@ -452,7 +452,7 @@
- INSERT INTO t1 VALUES (1,9),(2,7),(3,6),(4,3),(5,1);
- EXPLAIN SELECT pk, c1 FROM t1 WHERE pk <> 3;
- id select_type table type possible_keys key key_len ref rows Extra
--1 SIMPLE t1 range PRIMARY PRIMARY 4 NULL 4 Using index condition
-+1 SIMPLE t1 range PRIMARY PRIMARY 4 NULL 4 Using where
- SET SESSION optimizer_switch='index_condition_pushdown=off';
- SELECT pk, c1 FROM t1 WHERE pk <> 3;
- pk c1
-@@ -507,8 +507,8 @@
- WHERE (t2.pk <= 4 AND t1.pk IN (2,1)) OR
- (t1.pk > 1 AND t2.pk BETWEEN 6 AND 6);
- id select_type table type possible_keys key key_len ref rows Extra
--1 SIMPLE t1 range PRIMARY PRIMARY 4 NULL 1 Using index condition; Using where
--1 SIMPLE t2 range PRIMARY PRIMARY 4 NULL 2 Using index condition; Using where; Using join buffer (flat, BNL join)
-+1 SIMPLE t1 range PRIMARY PRIMARY 4 NULL 1 Using where
-+1 SIMPLE t2 range PRIMARY PRIMARY 4 NULL 2 Using where; Using join buffer (flat, BNL join)
- SELECT c2 FROM t1 JOIN t2 ON t1.c1 = t2.c1
- WHERE (t2.pk <= 4 AND t1.pk IN (2,1)) OR
- (t1.pk > 1 AND t2.pk BETWEEN 6 AND 6);
@@ -637,7 +637,7 @@
WHERE NOT(b = 'Texas') AND b BETWEEN 'wy' AND 'y' OR b = 'Pennsylvania'
ORDER BY a;
@@ -65,21 +27,23 @@
SELECT * FROM t1
WHERE NOT(b = 'Texas') AND b BETWEEN 'wy' AND 'y' OR b = 'Pennsylvania'
ORDER BY a;
-@@ -680,7 +680,7 @@
- SELECT t1.b, t1.c FROM t1, t2 WHERE t1.a = t2.a AND t1.b != 0
- HAVING t1.c != 5 ORDER BY t1.c;
- id select_type table type possible_keys key key_len ref rows Extra
--1 SIMPLE t1 range PRIMARY PRIMARY 4 NULL 2 Using index condition; Using where; Using filesort
-+1 SIMPLE t1 range PRIMARY PRIMARY 4 NULL 2 Using where; Using filesort
- 1 SIMPLE t2 ref a a 515 test.t1.a 1 Using where
- SELECT t1.b, t1.c FROM t1, t2 WHERE t1.a = t2.a AND t1.b != 0
- HAVING t1.c != 5 ORDER BY t1.c;
-@@ -793,7 +793,7 @@
- 1 PRIMARY t ALL PRIMARY,c NULL NULL NULL 64 Using where
- 1 PRIMARY t2 ref g g 5 test.t.c 9 Using where
- 2 DEPENDENT SUBQUERY t1 index PRIMARY d 3 NULL 64 Using where; Using index
--2 DEPENDENT SUBQUERY t2 eq_ref PRIMARY PRIMARY 4 test.t1.a 1 Using index condition; Using where
-+2 DEPENDENT SUBQUERY t2 eq_ref PRIMARY PRIMARY 4 test.t1.a 1 Using where
- SELECT COUNT(*) FROM t1 AS t, t2
- WHERE c = g
- AND (EXISTS (SELECT * FROM t1, t2 WHERE a = f AND h <= t.e AND a > t.b)
+@@ -825,15 +825,15 @@
+ 4 4
+ show status like "Handler_icp%";
+ Variable_name Value
+-Handler_icp_attempts 2
+-Handler_icp_match 1
++Handler_icp_attempts 0
++Handler_icp_match 0
+ SELECT * FROM t1 WHERE (c2='3' or c2='4') and c2 % 2 = 0 ;
+ c1 c2
+ 4 4
+ show status like "Handler_icp%";
+ Variable_name Value
+-Handler_icp_attempts 2
+-Handler_icp_match 1
++Handler_icp_attempts 0
++Handler_icp_match 0
+ DROP TABLE t1;
+ #
+ # BUG#920132: Assert trx->n_active_thrs == 1 failed at que0que.c line 1050
diff --git a/mysql-test/r/innodb_mrr_cpk,innodb_plugin.rdiff b/mysql-test/r/innodb_mrr_cpk,innodb_plugin.rdiff
index bfbb89400e0..ab64fc153cc 100644
--- a/mysql-test/r/innodb_mrr_cpk,innodb_plugin.rdiff
+++ b/mysql-test/r/innodb_mrr_cpk,innodb_plugin.rdiff
@@ -1,5 +1,5 @@
---- r/innodb_mrr_cpk.result 2011-10-21 23:35:26.000000000 +0200
-+++ r/innodb_mrr_cpk.reject 2012-02-07 12:47:49.000000000 +0100
+--- r/innodb_mrr_cpk.result 2012-02-23 15:57:49.000000000 +0100
++++ r/innodb_mrr_cpk,innodb_plugin.reject 2012-02-23 19:44:57.000000000 +0100
@@ -27,13 +27,13 @@
explain select * from t1, t2 where t1.a=t2.a;
id select_type table type possible_keys key key_len ref rows Extra
@@ -50,7 +50,7 @@
explain select * from t1, t2 where t1.a=t2.a and t1.b=t2.b;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t2 ALL NULL NULL NULL NULL 3 Using where
--1 SIMPLE t1 eq_ref PRIMARY PRIMARY 30 test.t2.a,test.t2.b 1 Using index condition(BKA); Using join buffer (flat, BKA join); Key-ordered scan
+-1 SIMPLE t1 eq_ref PRIMARY PRIMARY 30 test.t2.a,test.t2.b 1 Using where; Using join buffer (flat, BKA join); Key-ordered scan
+1 SIMPLE t1 eq_ref PRIMARY PRIMARY 30 test.t2.a,test.t2.b 1 Using where
select * from t1, t2 where t1.a=t2.a and t1.b=t2.b;
a b filler a b
@@ -61,7 +61,7 @@
explain select * from t1, t2 where t1.a=t2.a;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t2 ALL NULL NULL NULL NULL 3 Using where
--1 SIMPLE t1 ref PRIMARY PRIMARY 26 test.t2.a 1 Using index condition(BKA); Using join buffer (flat, BKA join); Key-ordered scan
+-1 SIMPLE t1 ref PRIMARY PRIMARY 26 test.t2.a 1 Using where; Using join buffer (flat, BKA join); Key-ordered scan
+1 SIMPLE t1 ref PRIMARY PRIMARY 26 test.t2.a 1 Using where
select * from t1, t2 where t1.a=t2.a;
a b filler a b
@@ -96,7 +96,7 @@
explain select * from t1, t2 where t1.a=t2.a and t2.b + t1.b > 100;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t2 ALL NULL NULL NULL NULL 3 Using where
--1 SIMPLE t1 ref PRIMARY PRIMARY 4 test.t2.a 1 Using index condition(BKA); Using join buffer (flat, BKA join); Key-ordered scan
+-1 SIMPLE t1 ref PRIMARY PRIMARY 4 test.t2.a 1 Using where; Using join buffer (flat, BKA join); Key-ordered scan
+1 SIMPLE t1 ref PRIMARY PRIMARY 4 test.t2.a 1 Using where
select * from t1, t2 where t1.a=t2.a and t2.b + t1.b > 100;
a b c filler a b
diff --git a/mysql-test/r/plugin_innodb,innodb_plugin.rdiff b/mysql-test/r/plugin_innodb,innodb_plugin.rdiff
deleted file mode 100644
index d76f2356ae0..00000000000
--- a/mysql-test/r/plugin_innodb,innodb_plugin.rdiff
+++ /dev/null
@@ -1,12 +0,0 @@
---- r/plugin_innodb.result 2011-10-21 23:35:26.000000000 +0200
-+++ r/plugin_innodb.reject 2012-02-08 13:59:19.000000000 +0100
-@@ -4,6 +4,9 @@
- alter table mysql.plugin engine=innodb;
- restart
- create table t1(a int) engine=example;
-+Warnings:
-+Warning 1286 Unknown storage engine 'example'
-+Warning 1266 Using storage engine MyISAM for table 't1'
- select * from t1;
- a
- drop table t1;
diff --git a/mysql-test/r/range_vs_index_merge_innodb,innodb_plugin.rdiff b/mysql-test/r/range_vs_index_merge_innodb,innodb_plugin.rdiff
index b31cb319732..c71cc7c6b45 100644
--- a/mysql-test/r/range_vs_index_merge_innodb,innodb_plugin.rdiff
+++ b/mysql-test/r/range_vs_index_merge_innodb,innodb_plugin.rdiff
@@ -1,5 +1,5 @@
---- r/range_vs_index_merge_innodb.result 2011-11-23 22:19:38.000000000 +0100
-+++ r/range_vs_index_merge_innodb.reject 2012-02-08 13:04:41.000000000 +0100
+--- r/range_vs_index_merge_innodb.result 2012-02-23 15:57:49.000000000 +0100
++++ r/range_vs_index_merge_innodb,innodb_plugin.reject 2012-02-23 19:46:02.000000000 +0100
@@ -50,14 +50,14 @@
WHERE (Population >= 100000 OR Name LIKE 'P%') AND Country='CAN' OR
(Population < 100000 OR Name Like 'T%') AND Country='ARG';
@@ -87,22 +87,7 @@
EXPLAIN
SELECT * FROM City
WHERE (Name < 'Ac' AND (Country > 'A' AND Country < 'B')) OR
-@@ -328,34 +328,34 @@
- EXPLAIN
- SELECT * FROM City WHERE (ID < 10) OR (ID BETWEEN 100 AND 110);
- id select_type table type possible_keys key key_len ref rows Extra
--1 SIMPLE City range PRIMARY PRIMARY 4 NULL 20 Using index condition; Using where
-+1 SIMPLE City range PRIMARY PRIMARY 4 NULL 20 Using where
- EXPLAIN
- SELECT * FROM City WHERE (ID < 200) OR (ID BETWEEN 100 AND 200);
- id select_type table type possible_keys key key_len ref rows Extra
--1 SIMPLE City range PRIMARY PRIMARY 4 NULL 200 Using index condition; Using where
-+1 SIMPLE City range PRIMARY PRIMARY 4 NULL 200 Using where
- EXPLAIN
- SELECT * FROM City WHERE (ID < 600) OR (ID BETWEEN 900 AND 1500);
- id select_type table type possible_keys key key_len ref rows Extra
--1 SIMPLE City range PRIMARY PRIMARY 4 NULL 1198 Using index condition; Using where
-+1 SIMPLE City range PRIMARY PRIMARY 4 NULL 1198 Using where
+@@ -340,15 +340,15 @@
EXPLAIN
SELECT * FROM City WHERE Country > 'A' AND Country < 'ARG';
id select_type table type possible_keys key key_len ref rows Extra
@@ -121,24 +106,7 @@
EXPLAIN
SELECT * FROM City
WHERE ((ID < 10) AND (Name LIKE 'H%' OR (Country > 'A' AND Country < 'ARG')))
- OR ((ID BETWEEN 100 AND 110) AND
- (Name LIKE 'P%' OR (Population > 103000 AND Population < 104000)));
- id select_type table type possible_keys key key_len ref rows Extra
--1 SIMPLE City range PRIMARY,Population,Country,Name PRIMARY 4 NULL 20 Using index condition; Using where
-+1 SIMPLE City range PRIMARY,Population,Country,Name PRIMARY 4 NULL 20 Using where
- EXPLAIN
- SELECT * FROM City
- WHERE ((ID < 800) AND (Name LIKE 'Ha%' OR (Country > 'A' AND Country < 'ARG')))
-@@ -369,7 +369,7 @@
- OR ((ID BETWEEN 100 AND 200) AND
- (Name LIKE 'Pa%' OR (Population > 103000 AND Population < 104000)));
- id select_type table type possible_keys key key_len ref rows Extra
--1 SIMPLE City range PRIMARY,Population,Country,Name PRIMARY 4 NULL 200 Using index condition; Using where
-+1 SIMPLE City range PRIMARY,Population,Country,Name PRIMARY 4 NULL 200 Using where
- SELECT * FROM City USE INDEX ()
- WHERE ((ID < 10) AND (Name LIKE 'H%' OR (Country > 'A' AND Country < 'ARG')))
- OR ((ID BETWEEN 100 AND 110) AND
-@@ -577,39 +577,39 @@
+@@ -577,27 +577,27 @@
EXPLAIN
SELECT * FROM City WHERE Population > 101000 AND Population < 102000;
id select_type table type possible_keys key key_len ref rows Extra
@@ -172,13 +140,7 @@
EXPLAIN
SELECT * FROM City WHERE ID BETWEEN 3400 AND 3800;
id select_type table type possible_keys key key_len ref rows Extra
--1 SIMPLE City range PRIMARY PRIMARY 4 NULL 400 Using index condition
-+1 SIMPLE City range PRIMARY PRIMARY 4 NULL 400 Using where
- EXPLAIN
- SELECT * FROM City WHERE ID BETWEEN 3790 AND 3800;
- id select_type table type possible_keys key key_len ref rows Extra
--1 SIMPLE City range PRIMARY PRIMARY 4 NULL 11 Using index condition
-+1 SIMPLE City range PRIMARY PRIMARY 4 NULL 11 Using where
+@@ -609,7 +609,7 @@
EXPLAIN
SELECT * FROM City WHERE Name LIKE 'P%';
id select_type table type possible_keys key key_len ref rows Extra
@@ -225,7 +187,7 @@
SELECT * FROM City
WHERE ((Population > 101000 AND Population < 103000) OR Name LIKE 'Pas%')
AND Country='USA';
-@@ -753,51 +753,51 @@
+@@ -753,15 +753,15 @@
EXPLAIN
SELECT * FROM City WHERE Country='USA';
id select_type table type possible_keys key key_len ref rows Extra
@@ -244,33 +206,7 @@
EXPLAIN
SELECT * FROM City WHERE ID BETWEEN 3790 AND 3800;
id select_type table type possible_keys key key_len ref rows Extra
--1 SIMPLE City range PRIMARY PRIMARY 4 NULL 11 Using index condition
-+1 SIMPLE City range PRIMARY PRIMARY 4 NULL 11 Using where
- EXPLAIN
- SELECT * FROM City WHERE ID BETWEEN 4025 AND 4035;
- id select_type table type possible_keys key key_len ref rows Extra
--1 SIMPLE City range PRIMARY PRIMARY 4 NULL 11 Using index condition
-+1 SIMPLE City range PRIMARY PRIMARY 4 NULL 11 Using where
- EXPLAIN
- SELECT * FROM City WHERE ID BETWEEN 4028 AND 4032;
- id select_type table type possible_keys key key_len ref rows Extra
--1 SIMPLE City range PRIMARY PRIMARY 4 NULL 5 Using index condition
-+1 SIMPLE City range PRIMARY PRIMARY 4 NULL 5 Using where
- EXPLAIN
- SELECT * FROM City WHERE ID BETWEEN 3500 AND 3800;
- id select_type table type possible_keys key key_len ref rows Extra
--1 SIMPLE City range PRIMARY PRIMARY 4 NULL 300 Using index condition
-+1 SIMPLE City range PRIMARY PRIMARY 4 NULL 300 Using where
- EXPLAIN
- SELECT * FROM City WHERE ID BETWEEN 4000 AND 4300;
- id select_type table type possible_keys key key_len ref rows Extra
--1 SIMPLE City range PRIMARY PRIMARY 4 NULL 80 Using index condition
-+1 SIMPLE City range PRIMARY PRIMARY 4 NULL 80 Using where
- EXPLAIN
- SELECT * FROM City WHERE ID BETWEEN 250 and 260 ;
- id select_type table type possible_keys key key_len ref rows Extra
--1 SIMPLE City range PRIMARY PRIMARY 4 NULL 11 Using index condition
-+1 SIMPLE City range PRIMARY PRIMARY 4 NULL 11 Using where
+@@ -789,15 +789,15 @@
EXPLAIN
SELECT * FROM City WHERE (Population > 101000 AND Population < 102000);
id select_type table type possible_keys key key_len ref rows Extra
@@ -315,12 +251,3 @@
SELECT * FROM City USE INDEX ()
WHERE ((Population > 101000 AND Population < 11000) OR
ID BETWEEN 3500 AND 3800) AND Country='USA'
-@@ -1422,7 +1422,7 @@
- WHERE t1.a>300 AND t1.c!=0 AND t1.b>=350 AND t1.b<=400 AND
- (t1.c=0 OR t1.a=500);
- id select_type table type possible_keys key key_len ref rows Extra
--1 SIMPLE t1 range PRIMARY,idx PRIMARY 4 NULL 1 Using index condition; Using where
-+1 SIMPLE t1 range PRIMARY,idx PRIMARY 4 NULL 1 Using where
- SELECT * FROM t1
- WHERE t1.a>300 AND t1.c!=0 AND t1.b>=350 AND t1.b<=400 AND
- (t1.c=0 OR t1.a=500);
diff --git a/mysql-test/suite/percona/percona_flush_contiguous_neighbors.test b/mysql-test/suite/percona/percona_flush_contiguous_neighbors.test
index 4eb967fcd16..728081fc493 100644
--- a/mysql-test/suite/percona/percona_flush_contiguous_neighbors.test
+++ b/mysql-test/suite/percona/percona_flush_contiguous_neighbors.test
@@ -2,7 +2,7 @@
# The test is very crude: we simply overflow the buffer pool with such a number of
# new/modified pages that some flushing is bound to happen.
---source include/have_innodb.inc
+--source include/have_xtradb.inc
--source include/big_test.inc
--disable_warnings
diff --git a/mysql-test/suite/percona/percona_sync_flush.test b/mysql-test/suite/percona/percona_sync_flush.test
index 35e8d8f92d2..4252bf03e7f 100644
--- a/mysql-test/suite/percona/percona_sync_flush.test
+++ b/mysql-test/suite/percona/percona_sync_flush.test
@@ -1,6 +1,6 @@
# Test for InnoDB sync state flushing.
---source include/have_innodb.inc
+--source include/have_xtradb.inc
--source include/have_debug.inc
--disable_warnings
diff --git a/mysql-test/suite/rpl/t/rpl_udf.test b/mysql-test/suite/rpl/t/rpl_udf.test
index 8643654f2a1..cc9c49a5dfe 100644
--- a/mysql-test/suite/rpl/t/rpl_udf.test
+++ b/mysql-test/suite/rpl/t/rpl_udf.test
@@ -5,8 +5,6 @@
# statement based format. This tests work completed in WL#3629. #
###################################################################
---source include/master-slave.inc
-
disable_query_log;
call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
enable_query_log;
View Lorry Controller Status