Adjusted tests after changing the default value for

the system variable @@in_subquery_conversion_threshold
MariaDB · Nov 4, 2017 · 9333431 · 9333431
1 parent 5b5aa23
commit 9333431
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result
@@ -1359,7 +1359,7 @@ idle-transaction-timeout 0
 idle-write-transaction-timeout 0
 ignore-builtin-innodb FALSE
 ignore-db-dirs 
-in-subquery-conversion-threshold 10000
+in-subquery-conversion-threshold 1000
 init-connect 
 init-file (No default value)
 init-rpl-role MASTER

diff --git a/mysql-test/r/range.result b/mysql-test/r/range.result
@@ -1,3 +1,4 @@
+set in_subquery_conversion_threshold=10000;
 drop table if exists t1, t2, t3, t10, t100;
 CREATE TABLE t1 (
 event_date date DEFAULT '0000-00-00' NOT NULL,
@@ -3006,3 +3007,4 @@ drop table t1,t2,t3;
 #
 # End of 10.2 tests
 #
+set in_subquery_conversion_threshold=default;
diff --git a/mysql-test/r/range_mrr_icp.result b/mysql-test/r/range_mrr_icp.result
@@ -1,5 +1,6 @@
 set @mrr_icp_extra_tmp=@@optimizer_switch;
 set optimizer_switch='mrr=on,mrr_sort_keys=on,index_condition_pushdown=on';
+set in_subquery_conversion_threshold=10000;
 drop table if exists t1, t2, t3, t10, t100;
 CREATE TABLE t1 (
 event_date date DEFAULT '0000-00-00' NOT NULL,
@@ -3018,4 +3019,5 @@ drop table t1,t2,t3;
 #
 # End of 10.2 tests
 #
+set in_subquery_conversion_threshold=default;
 set optimizer_switch=@mrr_icp_extra_tmp;
diff --git a/mysql-test/t/range.test b/mysql-test/t/range.test
@@ -3,6 +3,8 @@
 #
 --source include/have_innodb.inc
 
+set in_subquery_conversion_threshold=10000;
+
 --disable_warnings
 drop table if exists t1, t2, t3, t10, t100;
 --enable_warnings
@@ -2049,3 +2051,4 @@ drop table t1,t2,t3;
 --echo # End of 10.2 tests
 --echo #
 
+set in_subquery_conversion_threshold=default;