From 8609254f4f299cac7f047cd170ae09af17feed0b Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Thu, 12 May 2022 13:23:24 +0200 Subject: [PATCH] cleanup:have_log_bin.inc prefer if/skip over require (works better with debugging, not affected by query log) --- mysql-test/include/have_log_bin.inc | 7 +++---- mysql-test/include/have_log_bin.require | 2 -- 2 files changed, 3 insertions(+), 6 deletions(-) delete mode 100644 mysql-test/include/have_log_bin.require diff --git a/mysql-test/include/have_log_bin.inc b/mysql-test/include/have_log_bin.inc index eb2529dae3b..fd5dc66e416 100644 --- a/mysql-test/include/have_log_bin.inc +++ b/mysql-test/include/have_log_bin.inc @@ -8,7 +8,6 @@ source include/not_embedded.inc; --- require include/have_log_bin.require -disable_query_log; -show variables like 'log_bin'; -enable_query_log; +if (`select not @@log_bin`) { + skip Test requires: 'have_log_bin'; +} diff --git a/mysql-test/include/have_log_bin.require b/mysql-test/include/have_log_bin.require deleted file mode 100644 index d4fd77e4f8d..00000000000 --- a/mysql-test/include/have_log_bin.require +++ /dev/null @@ -1,2 +0,0 @@ -Variable_name Value -log_bin ON