Merge branch 'mysql-8.0' into mysql-trunk

dahlerlend · dahlerlend · commit 496dd9457baa · 2022-03-14T13:02:07.000+01:00
diff --git a/mysql-test/include/keyring_tests/innodb/tablespace_encrypt_11.inc b/mysql-test/include/keyring_tests/innodb/tablespace_encrypt_11.inc
@@ -111,7 +111,7 @@ ALTER TABLESPACE encrypt_ts ENCRYPTION='Y';
 
 --echo # INJECT error TOO_MANY_CONCURRENT_TXNS in startup location $location.
 --echo # It will cause FATAL error and server abort.
---error 0,2
+--error 0,2,-2147483645
 --exec $MYSQLD_CMD $PLUGIN_DIR_OPT --log-error=$MYSQLTEST_VARDIR/log/my_restart.err --debug=+d,$location
 
 --echo # Search the failure pattern in error log
diff --git a/mysql-test/suite/innodb/t/zlob_rollback_update.test b/mysql-test/suite/innodb/t/zlob_rollback_update.test
@@ -1,3 +1,4 @@
+--source include/have_innodb_max_16k.inc
 --source include/have_debug.inc
 --source include/count_sessions.inc
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+--source include/have_innodb_max_16k.inc`
`1`	`2`	`--source include/have_debug.inc`
`2`	`3`	`--source include/count_sessions.inc`
`3`	`4`