remove few .require files and one duplicate have_*inc file.

move variable tests from main to sys-vars
2012-02-23 07:52:27 +01:00 · 2012-02-23 07:52:27 +01:00 · a19a4618e3
commit a19a4618e3
parent 52108aa70c
13 changed files with 7 additions and 17 deletions
--- a/mysql-test/include/have_debug.inc
+++ b/mysql-test/include/have_debug.inc
@ -4,7 +4,6 @@
 #
 # The test below is redundant

-- require r/have_debug.require
-disable_query_log;
-select (version() like '%debug%') as debug;
-enable_query_log;
+if (`select version() not like '%debug%'`) {
+  --skip Needs a debug build
+}
--- a/mysql-test/include/have_nodebug.inc
+++ b/mysql-test/include/have_nodebug.inc
@ -1,4 +0,0 @@
-- require r/have_nodebug.require
-disable_query_log;
-select (version() like '%debug%') as debug;
-enable_query_log;
--- a/mysql-test/include/not_debug.inc
+++ b/mysql-test/include/not_debug.inc
@ -1,6 +1,5 @@
-let $is_debug = `select version() like '%debug%'`;
-if ($is_debug)
+if (`select version() like '%debug%'`)
 {
-  skip Does not run in with debug binaries;
+  skip Does not run with debug binaries;
 }

--- a/mysql-test/r/have_debug.require
+++ b/mysql-test/r/have_debug.require
@ -1,2 +0,0 @@
-debug
-1
--- a/mysql-test/r/have_nodebug.require
+++ b/mysql-test/r/have_nodebug.require
@ -1,2 +0,0 @@
-debug
-0
--- a/mysql-test/suite/percona/percona_server_variables_release.test
+++ b/mysql-test/suite/percona/percona_server_variables_release.test
@ -1,2 +1,2 @@
--source include/have_nodebug.inc
+--source include/not_debug.inc
 --source percona_server_variables.inc
--- a/mysql-test/suite/sys_vars/r/debug_dbug_func.result
+++ b/mysql-test/suite/sys_vars/r/debug_dbug_func.result
--- a/mysql-test/suite/sys_vars/r/debug_dbug_func_notembedded.result
+++ b/mysql-test/suite/sys_vars/r/debug_dbug_func_notembedded.result
--- a/mysql-test/suite/sys_vars/r/transaction_prealloc_size_bug27322.result
+++ b/mysql-test/suite/sys_vars/r/transaction_prealloc_size_bug27322.result
--- a/mysql-test/suite/sys_vars/t/debug_dbug_func.test
+++ b/mysql-test/suite/sys_vars/t/debug_dbug_func.test
--- a/mysql-test/suite/sys_vars/t/debug_dbug_func_notembedded.test
+++ b/mysql-test/suite/sys_vars/t/debug_dbug_func_notembedded.test
--- a/mysql-test/suite/sys_vars/t/transaction_prealloc_size_bug27322.test
+++ b/mysql-test/suite/sys_vars/t/transaction_prealloc_size_bug27322.test
--- a/mysql-test/t/sp-no-code.test
+++ b/mysql-test/t/sp-no-code.test
@ -2,7 +2,7 @@
 # Test the debugging feature "show procedure/function code <name>" 
 #

-- source include/have_nodebug.inc
+-- source include/not_debug.inc

 --error ER_FEATURE_DISABLED
 show procedure code foo;