summaryrefslogtreecommitdiff
path: root/mysql-test/include/have_mutex_deadlock_detector.inc
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2011-10-25 12:53:40 +0200
committerunknown <knielsen@knielsen-hq.org>2011-10-25 12:53:40 +0200
commit5da52cd108468580f036b479be77ef80c64d1181 (patch)
tree5aba76b06329ff2c6ef9d6f277ad57c027728ddc /mysql-test/include/have_mutex_deadlock_detector.inc
parent90b43902b0e67bcd4c6a5f08d7d76c93df74d4c8 (diff)
downloadmariadb-git-5da52cd108468580f036b479be77ef80c64d1181.tar.gz
Some after-merge fixes for 5.5 merge.
Diffstat (limited to 'mysql-test/include/have_mutex_deadlock_detector.inc')
-rw-r--r--mysql-test/include/have_mutex_deadlock_detector.inc4
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/include/have_mutex_deadlock_detector.inc b/mysql-test/include/have_mutex_deadlock_detector.inc
new file mode 100644
index 00000000000..3672f3eccef
--- /dev/null
+++ b/mysql-test/include/have_mutex_deadlock_detector.inc
@@ -0,0 +1,4 @@
+--require r/have_mutex_deadlock_detector.require
+disable_query_log;
+select 1 from information_schema.global_variables where variable_name = "mutex_deadlock_detector";
+enable_query_log;