diff options
Diffstat (limited to 'mysql-test/main/partition_innodb_plugin.result')
| -rw-r--r-- | mysql-test/main/partition_innodb_plugin.result | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mysql-test/main/partition_innodb_plugin.result b/mysql-test/main/partition_innodb_plugin.result index 2499c30b681..8211f0aac89 100644 --- a/mysql-test/main/partition_innodb_plugin.result +++ b/mysql-test/main/partition_innodb_plugin.result @@ -29,7 +29,7 @@ t1 CREATE TABLE `t1` ( `time` date NOT NULL, `id2` bigint(20) NOT NULL, PRIMARY KEY (`id`,`time`) -) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci +) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci PARTITION BY RANGE (to_days(`time`)) (PARTITION `p10` VALUES LESS THAN (734708) ENGINE = InnoDB, PARTITION `p20` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) @@ -104,6 +104,10 @@ disconnect con2; connection default; SET @@global.innodb_strict_mode = @old_innodb_strict_mode; SET @@global.innodb_file_per_table = @old_innodb_file_per_table; +SET @save_detect= @@GLOBAL.innodb_deadlock_detect; +SET @save_report= @@GLOBAL.innodb_deadlock_report; +SET GLOBAL innodb_deadlock_detect=ON; +SET GLOBAL innodb_deadlock_report=BASIC; SET NAMES utf8; CREATE TABLE `t``\""e` (a INT, PRIMARY KEY (a)) ENGINE=InnoDB @@ -148,6 +152,8 @@ set sql_mode = 'ANSI_QUOTES'; SHOW ENGINE InnoDB STATUS; Type Name Status InnoDB index PRIMARY of table `test`.`t``\""e` /* Partition `p0``\""e`, Subpartition `sp0``\""e` */ +SET GLOBAL innodb_deadlock_detect= @save_detect; +SET GLOBAL innodb_deadlock_report= @save_report; set @@sql_mode = @old_sql_mode; connection con1; ROLLBACK; |