diff options
Diffstat (limited to 'mysql-test/include')
13 files changed, 9 insertions, 161 deletions
diff --git a/mysql-test/include/have_innodb.opt b/mysql-test/include/have_innodb.opt index 5d9121b3dc3..4fb96229a7b 100644 --- a/mysql-test/include/have_innodb.opt +++ b/mysql-test/include/have_innodb.opt @@ -1,2 +1,2 @@ --loose-innodb ---plugin-load=$HA_INNODB_SO +--plugin-load=$HA_XTRADB_SO diff --git a/mysql-test/include/have_xtradb.inc b/mysql-test/include/have_xtradb.inc index 5832267375c..cf92b0317df 100644 --- a/mysql-test/include/have_xtradb.inc +++ b/mysql-test/include/have_xtradb.inc @@ -1,3 +1,4 @@ +--source include/have_innodb.inc if (!`SELECT count(*) FROM information_schema.plugins WHERE plugin_name = 'innodb' AND plugin_status = 'active' AND plugin_description LIKE '%xtradb%'`){ diff --git a/mysql-test/include/mix1.inc b/mysql-test/include/mix1.inc index c5995987914..4614535c188 100644 --- a/mysql-test/include/mix1.inc +++ b/mysql-test/include/mix1.inc @@ -1120,6 +1120,11 @@ INSERT INTO t1 (a,b,c) VALUES (1,1,1), (2,1,1), (3,1,1), (4,1,1); INSERT INTO t1 (a,b,c) SELECT a+4,b,c FROM t1; # should be range access + +# +# InnoDB uses "where", while xtradb "index condition" +# +--replace_regex /where/index condition/ EXPLAIN SELECT a, b, c FROM t1 WHERE b = 1 ORDER BY a DESC LIMIT 5; # should produce '8 7 6 5 4' for a diff --git a/mysql-test/include/mysqld--help.inc b/mysql-test/include/mysqld--help.inc index a39615d6011..91fe9bf00e3 100644 --- a/mysql-test/include/mysqld--help.inc +++ b/mysql-test/include/mysqld--help.inc @@ -22,7 +22,7 @@ perl; # Plugins which may or may not be there: @plugins=qw/innodb ndb archive blackhole federated partition ndbcluster debug temp-pool ssl des-key-file - thread-concurrency super-large-pages mutex-deadlock-detector null-audit maria aria pbxt oqgraph sphinx/; + xtradb thread-concurrency super-large-pages mutex-deadlock-detector null-audit maria aria pbxt oqgraph sphinx/; # And substitute the content some environment variables with their # names: @@ -39,7 +39,7 @@ perl; next if /Value \(after reading options\)/; # skip table header next if /^($re1) /; next if /^($re2)-/; - $skip=0 if /^ -/; + $skip=0 if /^ -/ or /^$/; $skip=1 if / --($re2)\b/; y!\\!/!; s/[ ]+/ /; # squeeze spaces to remove table formatting diff --git a/mysql-test/include/percona_query_cache_with_comments.inc b/mysql-test/include/percona_query_cache_with_comments.inc deleted file mode 100644 index bed87bd4c22..00000000000 --- a/mysql-test/include/percona_query_cache_with_comments.inc +++ /dev/null @@ -1,95 +0,0 @@ ---source include/percona_query_cache_with_comments_clear.inc -let $query=/* with comment first */select * from t1; -eval $query; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=# with comment first -select * from t1; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=-- with comment first -select * from t1; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=/* with comment first and "quote" */select * from t1; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=# with comment first and "quote" -select * from t1; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=-- with comment first and "quote" -select * from t1; ---source include/percona_query_cache_with_comments_eval.inc - -let $query= - /* with comment and whitespaces first */select * from t1; ---source include/percona_query_cache_with_comments_eval.inc - -let $query= - # with comment and whitespaces first -select * from t1; ---source include/percona_query_cache_with_comments_eval.inc - -let $query= - -- with comment and whitespaces first -select * from t1; ---source include/percona_query_cache_with_comments_eval.inc - -let $internal=* internal comment *; - -let $query=select * /$internal/ from t1; ---source include/percona_query_cache_with_comments_eval.inc -let $query=select */$internal/ from t1; ---source include/percona_query_cache_with_comments_eval.inc -let $query=select */$internal/from t1; ---source include/percona_query_cache_with_comments_eval.inc - -let $internal=* internal comment with "quote" *; - -let $query=select * /$internal/ from t1; ---source include/percona_query_cache_with_comments_eval.inc -let $query=select */$internal/ from t1; ---source include/percona_query_cache_with_comments_eval.inc -let $query=select */$internal/from t1; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=select * from t1 -; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=select * from t1 ; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=select * from t1 ; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=select * from t1 -/* comment in the end */; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=select * from t1 -/* *\/ */; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=select * from t1 -/* comment in the end */ -; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=select * from t1 #comment in the end; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=select * from t1 #comment in the end -; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=select * from t1 -- comment in the end; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=select * from t1 -- comment in the end -; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=select ' \' ' from t1; ---source include/percona_query_cache_with_comments_eval.inc diff --git a/mysql-test/include/percona_query_cache_with_comments_begin.inc b/mysql-test/include/percona_query_cache_with_comments_begin.inc deleted file mode 100644 index 38bfce20263..00000000000 --- a/mysql-test/include/percona_query_cache_with_comments_begin.inc +++ /dev/null @@ -1,12 +0,0 @@ --- source include/have_query_cache.inc - -set GLOBAL query_cache_size=1355776; - ---disable_warnings -drop table if exists t1; ---enable_warnings - -create table t1 (a int not null); -insert into t1 values (1),(2),(3); - ---source include/percona_query_cache_with_comments_clear.inc diff --git a/mysql-test/include/percona_query_cache_with_comments_clear.inc b/mysql-test/include/percona_query_cache_with_comments_clear.inc deleted file mode 100644 index 728a19a3c97..00000000000 --- a/mysql-test/include/percona_query_cache_with_comments_clear.inc +++ /dev/null @@ -1,5 +0,0 @@ -# Reset query cache variables. -flush query cache; # This crashed in some versions -flush query cache; # This crashed in some versions -reset query cache; -flush status; diff --git a/mysql-test/include/percona_query_cache_with_comments_end.inc b/mysql-test/include/percona_query_cache_with_comments_end.inc deleted file mode 100644 index d5356359d7e..00000000000 --- a/mysql-test/include/percona_query_cache_with_comments_end.inc +++ /dev/null @@ -1,3 +0,0 @@ -DROP TABLE t1; -SET GLOBAL query_cache_size=default; -set global query_cache_strip_comments=OFF; diff --git a/mysql-test/include/percona_query_cache_with_comments_eval.inc b/mysql-test/include/percona_query_cache_with_comments_eval.inc deleted file mode 100644 index a409786d554..00000000000 --- a/mysql-test/include/percona_query_cache_with_comments_eval.inc +++ /dev/null @@ -1,7 +0,0 @@ -echo -----------------------------------------------------; -echo $query; -echo -----------------------------------------------------; ---source include/percona_query_cache_with_comments_show.inc -eval $query; -eval $query; ---source include/percona_query_cache_with_comments_show.inc diff --git a/mysql-test/include/percona_query_cache_with_comments_show.inc b/mysql-test/include/percona_query_cache_with_comments_show.inc deleted file mode 100644 index 71aa5211cfd..00000000000 --- a/mysql-test/include/percona_query_cache_with_comments_show.inc +++ /dev/null @@ -1,8 +0,0 @@ -let $show=show status like "Qcache_queries_in_cache"; -eval $show; -let $show=show status like "Qcache_inserts"; -eval $show; -let $show=show status like "Qcache_hits"; -eval $show; - - diff --git a/mysql-test/include/percona_query_response_time_flush.inc b/mysql-test/include/percona_query_response_time_flush.inc deleted file mode 100644 index 44bb320fe13..00000000000 --- a/mysql-test/include/percona_query_response_time_flush.inc +++ /dev/null @@ -1 +0,0 @@ -FLUSH QUERY_RESPONSE_TIME; diff --git a/mysql-test/include/percona_query_response_time_show.inc b/mysql-test/include/percona_query_response_time_show.inc deleted file mode 100644 index 709abf9872e..00000000000 --- a/mysql-test/include/percona_query_response_time_show.inc +++ /dev/null @@ -1,8 +0,0 @@ -SELECT d.count, -(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count, -(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count != 0) as not_zero_region_count, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count -FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as d WHERE d.count > 0; -SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -SELECT time FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; diff --git a/mysql-test/include/percona_query_response_time_sleep.inc b/mysql-test/include/percona_query_response_time_sleep.inc deleted file mode 100644 index 40688b173b0..00000000000 --- a/mysql-test/include/percona_query_response_time_sleep.inc +++ /dev/null @@ -1,19 +0,0 @@ -SELECT SLEEP(0.31); -SELECT SLEEP(0.32); -SELECT SLEEP(0.33); -SELECT SLEEP(0.34); -SELECT SLEEP(0.35); -SELECT SLEEP(0.36); -SELECT SLEEP(0.37); -SELECT SLEEP(0.38); -SELECT SLEEP(0.39); -SELECT SLEEP(0.40); -SELECT SLEEP(1.1); -SELECT SLEEP(1.2); -SELECT SLEEP(1.3); -SELECT SLEEP(1.5); -SELECT SLEEP(1.4); -SELECT SLEEP(0.5); -SELECT SLEEP(2.1); -SELECT SLEEP(2.3); -SELECT SLEEP(2.5); |