summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2012-12-18 22:00:55 +0100
committerunknown <knielsen@knielsen-hq.org>2012-12-18 22:00:55 +0100
commit490d2a42670deac197af80977c1f1b0f3e0ff2ad (patch)
tree476380e81e950f487c49159b05ea2a43627b99ca
parent6a742fc3b12527c5bd4817957de01ce22c0c8bba (diff)
downloadmariadb-git-490d2a42670deac197af80977c1f1b0f3e0ff2ad.tar.gz
Previous change of have_debug_sync.inc broke non-debug builds.
Implement it in a different way that works on both release and debug builds, and still uses --skip instead of --require.
-rw-r--r--mysql-test/include/have_debug_sync.inc5
1 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/include/have_debug_sync.inc b/mysql-test/include/have_debug_sync.inc
index ea2247a2746..8efec7dad95 100644
--- a/mysql-test/include/have_debug_sync.inc
+++ b/mysql-test/include/have_debug_sync.inc
@@ -1,3 +1,4 @@
-if (`select @@debug_sync not like 'ON %'`) {
- --skip Needs a debug_sync enabled
+if (`SELECT COUNT(*) = 0 FROM information_schema.session_variables WHERE
+ variable_name = 'debug_sync' AND variable_value LIKE 'ON %'`) {
+ --skip Needs debug_sync enabled
}