diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-04-04 11:37:13 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-04-04 11:37:13 +0200 |
| commit | 730f67a43e993a9a251026b781b4c6c9cdbb2c69 (patch) | |
| tree | fb1dd6878eb07fbbc22932514dfe357bd0c68a8f | |
| parent | 33f3c93e6feb9550e465b2373c2ba24fa65a4967 (diff) | |
| download | mariadb-git-730f67a43e993a9a251026b781b4c6c9cdbb2c69.tar.gz | |
fix have_debug_sync.inc to be more robust
(debug_sync value can have single quotes)
| -rw-r--r-- | mysql-test/include/have_debug_sync.inc | 9 | ||||
| -rw-r--r-- | mysql-test/r/have_debug_sync.require | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/mysql-test/include/have_debug_sync.inc b/mysql-test/include/have_debug_sync.inc index 7aa5baf3342..dbe6dfddd26 100644 --- a/mysql-test/include/have_debug_sync.inc +++ b/mysql-test/include/have_debug_sync.inc @@ -1,5 +1,4 @@ ---require r/have_debug_sync.require -disable_query_log; -let $value= query_get_value(SHOW VARIABLES LIKE 'debug_sync', Value, 1); -eval SELECT ('$value' LIKE 'ON %') AS debug_sync; -enable_query_log; +if (`select count(*) = 0 from information_schema.session_variables where variable_name = 'debug_sync' and variable_value like 'on %'`) +{ + skip debug_sync is not available; +} diff --git a/mysql-test/r/have_debug_sync.require b/mysql-test/r/have_debug_sync.require deleted file mode 100644 index c2090bc5657..00000000000 --- a/mysql-test/r/have_debug_sync.require +++ /dev/null @@ -1,2 +0,0 @@ -debug_sync -1 |