diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2022-05-12 13:23:24 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2022-05-18 01:22:29 +0200 |
| commit | 8609254f4f299cac7f047cd170ae09af17feed0b (patch) | |
| tree | 6fec751b348a54c2b68b854d1ac64515a4dd5f07 | |
| parent | 74068dd2ac9e2cc221e226d6412825f2d4f3dd40 (diff) | |
| download | mariadb-git-8609254f4f299cac7f047cd170ae09af17feed0b.tar.gz | |
cleanup:have_log_bin.inc
prefer if/skip over require
(works better with debugging, not affected by query log)
| -rw-r--r-- | mysql-test/include/have_log_bin.inc | 7 | ||||
| -rw-r--r-- | mysql-test/include/have_log_bin.require | 2 |
2 files changed, 3 insertions, 6 deletions
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 |