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

move variable tests from main to sys-vars

mysql-test/include/have_debug.inc

@@ -4,7 +4,6 @@
 #
 # The test below is redundant
 
--- require r/have_debug.require
+if (`select version() not like '%debug%'`) {
-disable_query_log;
+  --skip Needs a debug build
-select (version() like '%debug%') as debug;
+}
-enable_query_log;

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;

mysql-test/include/not_debug.inc

@@ -1,6 +1,5 @@
-let $is_debug = `select version() like '%debug%'`;
+if (`select version() like '%debug%'`)
-if ($is_debug)
 {
-  skip Does not run in with debug binaries;
+  skip Does not run with debug binaries;
 }
 

mysql-test/r/have_debug.require

@@ -1,2 +0,0 @@
-debug
-1

mysql-test/r/have_nodebug.require

@@ -1,2 +0,0 @@
-debug
-0

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

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;