diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-12-17 21:00:36 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-12-17 21:00:36 +0100 |
| commit | 6c3de76ad5cb8683ab8b049e0bbba670115d304a (patch) | |
| tree | deac0b9cbc7ca829ec2699d9518b3a037dac13d0 | |
| parent | 1d2b11b291e2ac797ffae59b13f0c94967c052c6 (diff) | |
| download | mariadb-git-6c3de76ad5cb8683ab8b049e0bbba670115d304a.tar.gz | |
fix have_debug_sync.inc
remove unused require files
| -rw-r--r-- | mysql-test/include/have_debug_sync.inc | 8 | ||||
| -rw-r--r-- | mysql-test/r/have_debug_sync.require | 2 | ||||
| -rw-r--r-- | mysql-test/r/is_debug_build.require | 2 | ||||
| -rw-r--r-- | mysql-test/r/server_id.require | 2 | ||||
| -rw-r--r-- | mysql-test/r/server_id1.require | 2 | ||||
| -rw-r--r-- | mysql-test/r/testdb_only.require | 2 | ||||
| -rw-r--r-- | mysql-test/r/windows.require | 2 |
7 files changed, 3 insertions, 17 deletions
diff --git a/mysql-test/include/have_debug_sync.inc b/mysql-test/include/have_debug_sync.inc index 7aa5baf3342..ea2247a2746 100644 --- a/mysql-test/include/have_debug_sync.inc +++ b/mysql-test/include/have_debug_sync.inc @@ -1,5 +1,3 @@ ---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 @@debug_sync not like 'ON %'`) { + --skip Needs a debug_sync enabled +} 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 diff --git a/mysql-test/r/is_debug_build.require b/mysql-test/r/is_debug_build.require deleted file mode 100644 index 4d77bcdc1ed..00000000000 --- a/mysql-test/r/is_debug_build.require +++ /dev/null @@ -1,2 +0,0 @@ -instr(version(), "debug") > 0 -1 diff --git a/mysql-test/r/server_id.require b/mysql-test/r/server_id.require deleted file mode 100644 index adffcc483b1..00000000000 --- a/mysql-test/r/server_id.require +++ /dev/null @@ -1,2 +0,0 @@ -Variable_name Value -server_id 1 diff --git a/mysql-test/r/server_id1.require b/mysql-test/r/server_id1.require deleted file mode 100644 index 666c94ef633..00000000000 --- a/mysql-test/r/server_id1.require +++ /dev/null @@ -1,2 +0,0 @@ -Variable_name Value -server_id 102 diff --git a/mysql-test/r/testdb_only.require b/mysql-test/r/testdb_only.require deleted file mode 100644 index e717418fdb6..00000000000 --- a/mysql-test/r/testdb_only.require +++ /dev/null @@ -1,2 +0,0 @@ -Variable_name Value -use extern server NO diff --git a/mysql-test/r/windows.require b/mysql-test/r/windows.require deleted file mode 100644 index 09aae1ed1d0..00000000000 --- a/mysql-test/r/windows.require +++ /dev/null @@ -1,2 +0,0 @@ -TRUE -1 |