Skip to content

Commit e7ba7f0

Browse files
committed
Merge branch 'mysql-8.0' into mysql-trunk
2 parents ea1abd4 + f7d9ff5 commit e7ba7f0

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
MYSQL_VERSION_MAJOR=8
22
MYSQL_VERSION_MINOR=0
3-
MYSQL_VERSION_PATCH=6
3+
MYSQL_VERSION_PATCH=12
44
MYSQL_VERSION_EXTRA=-tr

mysql-test/suite/innodb/t/ddl_crash_alter_table_tablespace.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
--source include/not_crashrep.inc
44
--disable_query_log
55
CALL mtr.add_suppression("\\[ERROR\\] Could not find a valid tablespace file for");
6+
CALL mtr.add_suppression("\\[ERROR\\] \\[[^]]*\\] InnoDB: MLOG_FILE_RENAME: Invalid to file name.* File name in the redo log is ''");
67
--enable_query_log
78

89
LET $innodb_ddl_log_crash_reset_debug_orig = `SELECT @@innodb_ddl_log_crash_reset_debug`;

0 commit comments

Comments
 (0)