diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-31 15:07:39 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-31 15:07:39 +0300 |
commit | 2e64145921b0065ad1234c2939eaf0049f4a68d8 (patch) | |
tree | fcd1ffa413e5215247676ff33d8484e175da02a2 /mysql-test/suite/versioning | |
parent | 58aaa67064cc5d2747d5172b54feb592a5842700 (diff) | |
parent | 55a344ffa38f08443e762685ba6c52756b7a4b3b (diff) | |
download | mariadb-git-2e64145921b0065ad1234c2939eaf0049f4a68d8.tar.gz |
Merge 10.6 into 10.7
Diffstat (limited to 'mysql-test/suite/versioning')
-rw-r--r-- | mysql-test/suite/versioning/r/cte.result | 3 | ||||
-rw-r--r-- | mysql-test/suite/versioning/r/partition.result | 4 | ||||
-rw-r--r-- | mysql-test/suite/versioning/r/select.result | 3 | ||||
-rw-r--r-- | mysql-test/suite/versioning/t/cte.test | 5 | ||||
-rw-r--r-- | mysql-test/suite/versioning/t/partition.test | 7 | ||||
-rw-r--r-- | mysql-test/suite/versioning/t/select.test | 5 |
6 files changed, 27 insertions, 0 deletions
diff --git a/mysql-test/suite/versioning/r/cte.result b/mysql-test/suite/versioning/r/cte.result index 4c0867d579b..6ca9c238d45 100644 --- a/mysql-test/suite/versioning/r/cte.result +++ b/mysql-test/suite/versioning/r/cte.result @@ -1,3 +1,5 @@ +SET @saved_stats_persistent = @@GLOBAL.innodb_stats_persistent; +SET GLOBAL innodb_stats_persistent = OFF; set time_zone="+00:00"; set default_storage_engine=innodb; create or replace table dept ( @@ -311,3 +313,4 @@ emp_id name mgr address drop table emp; drop table dept; drop table addr; +SET GLOBAL innodb_stats_persistent = @saved_stats_persistent; diff --git a/mysql-test/suite/versioning/r/partition.result b/mysql-test/suite/versioning/r/partition.result index d6e6d827ddc..f651d25ce7c 100644 --- a/mysql-test/suite/versioning/r/partition.result +++ b/mysql-test/suite/versioning/r/partition.result @@ -1,3 +1,5 @@ +SET @save_persistent=@@GLOBAL.innodb_stats_persistent; +SET GLOBAL innodb_stats_persistent=0; call mtr.add_suppression("need more HISTORY partitions"); set system_versioning_alter_history=keep; # Check conventional partitioning on temporal tables @@ -1281,3 +1283,5 @@ drop tables t1; # # End of 10.5 tests # +SET GLOBAL innodb_stats_persistent=@save_persistent; +# End of 10.6 tests diff --git a/mysql-test/suite/versioning/r/select.result b/mysql-test/suite/versioning/r/select.result index 6df18403ee3..90c99d1bf0e 100644 --- a/mysql-test/suite/versioning/r/select.result +++ b/mysql-test/suite/versioning/r/select.result @@ -1,3 +1,5 @@ +SET @saved_stats_persistent = @@GLOBAL.innodb_stats_persistent; +SET GLOBAL innodb_stats_persistent = OFF; create or replace table t1 ( x int unsigned, y int unsigned, @@ -705,3 +707,4 @@ No A B C D 32 1 1 1 1 33 1 1 1 1 34 1 1 1 1 +SET GLOBAL innodb_stats_persistent = @saved_stats_persistent; diff --git a/mysql-test/suite/versioning/t/cte.test b/mysql-test/suite/versioning/t/cte.test index 5f2a709eebe..025e1b2319d 100644 --- a/mysql-test/suite/versioning/t/cte.test +++ b/mysql-test/suite/versioning/t/cte.test @@ -5,6 +5,9 @@ if (`SELECT $PS_PROTOCOL != 0`) --source include/have_innodb.inc --source include/default_optimizer_switch.inc +SET @saved_stats_persistent = @@GLOBAL.innodb_stats_persistent; +SET GLOBAL innodb_stats_persistent = OFF; + set time_zone="+00:00"; set default_storage_engine=innodb; create or replace table dept ( @@ -230,3 +233,5 @@ select * from (select * from emp natural join addr) for system_time all as t; drop table emp; drop table dept; drop table addr; + +SET GLOBAL innodb_stats_persistent = @saved_stats_persistent; diff --git a/mysql-test/suite/versioning/t/partition.test b/mysql-test/suite/versioning/t/partition.test index 61cfe702f8a..044c0d64d37 100644 --- a/mysql-test/suite/versioning/t/partition.test +++ b/mysql-test/suite/versioning/t/partition.test @@ -2,6 +2,9 @@ -- source suite/versioning/common.inc -- source suite/versioning/engines.inc +SET @save_persistent=@@GLOBAL.innodb_stats_persistent; +SET GLOBAL innodb_stats_persistent=0; + call mtr.add_suppression("need more HISTORY partitions"); --enable_prepare_warnings @@ -1102,4 +1105,8 @@ drop tables t1; --echo # End of 10.5 tests --echo # +SET GLOBAL innodb_stats_persistent=@save_persistent; + +--echo # End of 10.6 tests + --source suite/versioning/common_finish.inc diff --git a/mysql-test/suite/versioning/t/select.test b/mysql-test/suite/versioning/t/select.test index bf27723adee..9142a8fae8a 100644 --- a/mysql-test/suite/versioning/t/select.test +++ b/mysql-test/suite/versioning/t/select.test @@ -6,6 +6,9 @@ if (`SELECT $PS_PROTOCOL != 0`) --source suite/versioning/common.inc --source include/default_optimizer_switch.inc +SET @saved_stats_persistent = @@GLOBAL.innodb_stats_persistent; +SET GLOBAL innodb_stats_persistent = OFF; + --enable_prepare_warnings # test_01 @@ -482,4 +485,6 @@ drop tables x, x_p; call verify_trt_dummy(34); --disable_prepare_warnings +SET GLOBAL innodb_stats_persistent = @saved_stats_persistent; + -- source suite/versioning/common_finish.inc |