summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei <andrei.elkin@mariadb.com>2023-04-14 13:13:03 +0300
committerAndrei <andrei.elkin@mariadb.com>2023-04-17 20:07:37 +0300
commit8f87023d3f3fbaad4e33991713db884cbe052fbc (patch)
tree77aefdec19409ac4dba7a287b112cc7f844ae1f4
parent3b85e3dcc11e9638c9670a299eccdb77a51c1a19 (diff)
downloadmariadb-git-8f87023d3f3fbaad4e33991713db884cbe052fbc.tar.gz
MDEV-28777 binlog.binlog_truncate_multi_engine failed in bb with Lost connection
The 2013 error was right to catch the case B of the test unprepared for an expected simulated crash. The test gets refined to SELECT a (type of) bool value before the crash is invoked.
-rw-r--r--mysql-test/suite/binlog/t/binlog_truncate_multi_engine.inc8
1 files changed, 5 insertions, 3 deletions
diff --git a/mysql-test/suite/binlog/t/binlog_truncate_multi_engine.inc b/mysql-test/suite/binlog/t/binlog_truncate_multi_engine.inc
index 52ce4741eaa..f3801070851 100644
--- a/mysql-test/suite/binlog/t/binlog_truncate_multi_engine.inc
+++ b/mysql-test/suite/binlog/t/binlog_truncate_multi_engine.inc
@@ -20,7 +20,9 @@ connect(con1,localhost,root,,);
--source include/show_binary_logs.inc
INSERT INTO t1 VALUES (1, REPEAT("x", 1));
INSERT INTO t2 VALUES (1, REPEAT("x", 1));
-if (`SELECT $case = "B"`)
+--let $is_case_B=`SELECT $case = "B"`
+
+if ($is_case_B)
{
--write_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
wait-binlog_truncate_multi_engine.test
@@ -39,12 +41,12 @@ if (`SELECT $debug_sync_action != ""`)
send COMMIT;
--connection default
-if (`SELECT $case = "B"`)
+if ($is_case_B)
{
--source include/wait_until_disconnected.inc
--source include/start_mysqld.inc
}
-if (`SELECT $case != "B"`)
+if (!$is_case_B)
{
SET DEBUG_SYNC= "now WAIT_FOR con1_ready";
--echo List of binary logs after rotation