From b97f4c340ead53c42ec674da19b420e57bf40ddc Mon Sep 17 00:00:00 2001 From: Sergei Petrunia Date: Mon, 4 Dec 2023 20:34:45 +0300 Subject: [PATCH] Followup for fix for MDEV-20169: enable main.partition_innodb --- mysql-test/main/disabled.def | 1 - mysql-test/main/partition_innodb.result | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mysql-test/main/disabled.def b/mysql-test/main/disabled.def index 02104f6a680..8ba5b271c2b 100644 --- a/mysql-test/main/disabled.def +++ b/mysql-test/main/disabled.def @@ -17,4 +17,3 @@ mysql_embedded : Bug#12561297 2011-05-14 Anitha Dependent on PB2 chang file_contents : MDEV-6526 these files are not installed anymore max_statement_time : cannot possibly work, depends on timing partition_open_files_limit : open_files_limit check broken by MDEV-18360 -partition_innodb : Waiting for fix MDEV-20169 diff --git a/mysql-test/main/partition_innodb.result b/mysql-test/main/partition_innodb.result index 669b62f0269..072786931ae 100644 --- a/mysql-test/main/partition_innodb.result +++ b/mysql-test/main/partition_innodb.result @@ -84,6 +84,8 @@ DROP TABLE t1; SET @old_innodb_thread_concurrency := @@innodb_thread_concurrency; SET @old_innodb_thread_sleep_delay := @@innodb_thread_sleep_delay; SET GLOBAL innodb_thread_concurrency = 1; +Warnings: +Warning 138 The parameter innodb_thread_concurrency is deprecated and has no effect. CREATE TABLE t1 (user_num BIGINT, hours SMALLINT, @@ -117,7 +119,11 @@ connection con1; disconnect con1; connection default; SET GLOBAL innodb_thread_concurrency = @old_innodb_thread_concurrency; +Warnings: +Warning 138 The parameter innodb_thread_concurrency is deprecated and has no effect. SET GLOBAL innodb_thread_sleep_delay = @old_innodb_thread_sleep_delay; +Warnings: +Warning 138 The parameter innodb_thread_sleep_delay is deprecated and has no effect. DROP TABLE t1; # # Bug#50418: DROP PARTITION does not interact with transactions