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

move variable tests from main to sys-vars

4 files changed, 1 insertions, 237 deletions

diff --git a/mysql-test/t/sp-no-code.test b/mysql-test/t/sp-no-code.test
index ce16c32a270..47a1a126627 100644
--- 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;
diff --git a/mysql-test/t/variables-big.test b/mysql-test/t/variables-big.test
deleted file mode 100644
index 58098f4c879..00000000000
--- a/mysql-test/t/variables-big.test
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-# test variables big
-#
-
---source include/big_test.inc
-# The test would allocate and initialize 5GB of memory
-# if compiled with debug. It can take a lot of time
-# of for paging/swapping.
---source include/not_debug.inc
-
-#
-# Bug#27322 failure to allocate transaction_prealloc_size causes crash
-#
-#
-# Manual (6.0):
-# Platform Bit Size  Range                      Default
-# 32                 1024-4294967295 (4 Gi - 1) 4096
-# 64                 1024-18446744073709547520  4096
-#
-# Observation(mleich):
-# 1. - Linux 64 Bit, MySQL 64 Bit, 4 GiB RAM, 8 GiB swap
-#    - SET SESSION transaction_prealloc_size=1099511627776;
-#      SHOW PROCESSLIST;
-#      Id   User ... Info
-#      <Id> root ... SHOW PROCESSLIST
-#      SELECT @@session.transaction_prealloc_size;
-#      @@session.transaction_prealloc_size
-#      1099511627776
-#      very short runtime in 5.0
-#      excessive resource consumption + long runtime in 5.1 and 6.0
-# 2. - Win in VM, slightly older version of this test, MySQL 5.0
-#    - testcase timeout after 900s
-#      analyze-timeout-mysqld.1.err :
-#      Id User ... Time Info
-#      83 root ... 542  set session transaction_prealloc_size=1024*1024*1024*2
-#      84 root ... 1    SHOW PROCESSLIST
-#
-# There is a significant probablitity that this tests fails with testcase
-# timeout if the testing box is not powerful enough.
-#
-SET @def_var= @@session.transaction_prealloc_size;
-
---disable_warnings
-SET SESSION transaction_prealloc_size=1024*1024*1024*1;
-# Embedded server is hardcoded to show "Writing to net" as STATE.
---replace_result "Writing to net" "NULL"
---replace_column 1 <Id> 3 <Host> 6 <Time>
-# Embedded server is hardcoded to show "Writing to net" as STATE.
---replace_result "Writing to net" "NULL"
---replace_regex /localhost[:0-9]*/localhost/
-SHOW PROCESSLIST;
-SET SESSION transaction_prealloc_size=1024*1024*1024*2;
---replace_result "Writing to net" "NULL"
---replace_column 1 <Id> 3 <Host> 6 <Time>
---replace_result "Writing to net" "NULL"
---replace_regex /localhost[:0-9]*/localhost/
-SHOW PROCESSLIST;
-SET SESSION transaction_prealloc_size=1024*1024*1024*3;
---replace_result "Writing to net" "NULL"
---replace_column 1 <Id> 3 <Host> 6 <Time>
---replace_result "Writing to net" "NULL"
---replace_regex /localhost[:0-9]*/localhost/
-SHOW PROCESSLIST;
-SET SESSION transaction_prealloc_size=1024*1024*1024*4;
---replace_result "Writing to net" "NULL"
---replace_column 1 <Id> 3 <Host> 6 <Time>
---replace_result "Writing to net" "NULL"
---replace_regex /localhost[:0-9]*/localhost/
-SHOW PROCESSLIST;
-SET SESSION transaction_prealloc_size=1024*1024*1024*5;
---replace_result "Writing to net" "NULL"
---replace_column 1 <Id> 3 <Host> 6 <Time>
---replace_result "Writing to net" "NULL"
-SHOW PROCESSLIST;
---enable_warnings
-
diff --git a/mysql-test/t/variables_debug.test b/mysql-test/t/variables_debug.test
deleted file mode 100644
index b57ff812ef5..00000000000
--- a/mysql-test/t/variables_debug.test
+++ /dev/null
@@ -1,126 +0,0 @@
---source include/have_debug.inc
-
-SET @old_debug = @@GLOBAL.debug;
-
-#
-# Bug#34678 @@debug variable's incremental mode
-#
-
-set debug_dbug= 'T';
-select @@debug;
-set debug_dbug= '+P';
-select @@debug;
-set debug_dbug= '-P';
-select @@debug;
-
-#
-# Bug#38054: "SET SESSION debug" modifies @@global.debug variable
-#
-
-SELECT @@session.debug, @@global.debug;
-
-SET SESSION debug_dbug= '';
-
-SELECT @@session.debug, @@global.debug;
-
---echo #
---echo # Bug #52629: memory leak from sys_var_thd_dbug in 
---echo #  binlog.binlog_write_error
---echo #
-
-SET GLOBAL debug_dbug='d,injecting_fault_writing';
-SELECT @@global.debug;
-SET GLOBAL debug_dbug='';
-SELECT @@global.debug;
-
-SET GLOBAL debug_dbug=@old_debug;
-
---echo #
---echo # Bug #56709: Memory leaks at running the 5.1 test suite
---echo # 
-
-SET @old_local_debug = @@debug;
-
-SET @@debug_dbug='d,foo';
-SELECT @@debug;
-SET @@debug_dbug='';
-SELECT @@debug;
-
-SET @@debug_dbug= @old_local_debug;
-
---echo End of 5.1 tests
-
-
---echo #
---echo # Bug#46165 server crash in dbug
---echo #
-
-SET @old_globaldebug = @@global.debug;
-SET @old_sessiondebug= @@session.debug;
-
---echo # Test 1 - Bug test case, single connection
-SET GLOBAL  debug_dbug= '+O,../../log/bug46165.1.trace';
-SET SESSION debug_dbug= '-d:-t:-i';
-
-SET GLOBAL  debug_dbug= '';
-SET SESSION debug_dbug= '';
-
---echo # Test 2 - Bug test case, two connections
---echo # Connection default
-connection default;
-SET GLOBAL  debug_dbug= '+O,../../log/bug46165.2.trace';
-SET SESSION debug_dbug= '-d:-t:-i';
-
---echo # Connection con1
-connect (con1, localhost, root);
-SET GLOBAL  debug_dbug= '';
-
---echo # Connection default
-connection default;
-SET SESSION debug_dbug= '';
---echo # Connection con1
-connection con1;
-disconnect con1;
---source include/wait_until_disconnected.inc
---echo # Connection default
-connection default;
-SET GLOBAL  debug_dbug= '';
-
---echo # Test 3 - Active session trace file on disconnect
---echo # Connection con1
-connect (con1, localhost, root);
-SET GLOBAL  debug_dbug= '+O,../../log/bug46165.3.trace';
-SET SESSION debug_dbug= '-d:-t:-i';
-SET GLOBAL  debug_dbug= '';
-disconnect con1;
---source include/wait_until_disconnected.inc
-
---echo # Test 4 - Active session trace file on two connections
---echo # Connection default
-connection default;
-SET GLOBAL  debug_dbug= '+O,../../log/bug46165.4.trace';
-SET SESSION debug_dbug= '-d:-t:-i';
-
---echo # Connection con1
-connect (con1, localhost, root);
-SET SESSION debug_dbug= '-d:-t:-i';
-SET GLOBAL  debug_dbug= '';
-SET SESSION debug_dbug= '';
-
---echo # Connection default
-connection default;
-SET SESSION debug_dbug= '';
---echo # Connection con1
-connection con1;
-disconnect con1;
---source include/wait_until_disconnected.inc
---echo # Connection default
-connection default;
-
---echo # Test 5 - Different trace files
-SET SESSION debug_dbug= '+O,../../log/bug46165.5.trace';
-SET SESSION debug_dbug= '+O,../../log/bug46165.6.trace';
-SET SESSION debug_dbug= '-O';
-
-SET GLOBAL  debug_dbug= @old_globaldebug;
-SET SESSION debug_dbug= @old_sessiondebug;
diff --git a/mysql-test/t/variables_debug_notembedded.test b/mysql-test/t/variables_debug_notembedded.test
deleted file mode 100644
index cb3797465a7..00000000000
--- a/mysql-test/t/variables_debug_notembedded.test
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Checks that assigning variable 'debug' in one session has no influence on
-# other session. (BUG#45632 of bugs.mysql.com)
-#
-# (this will not work with embedded server because mysqltest_embedded uses the
-#  same thread for all connections)
-#
---source include/have_debug.inc
---source include/not_embedded.inc
-
-connect(con1,localhost,root,,test,,);
-connect(con2,localhost,root,,test,,);
-
-# makes output independant of current debug status
-connection con1;
-set session debug_dbug="t";
-show session variables like 'debug';
-connection con2;
-set session debug_dbug="t";
-show session variables like 'debug';
-
-# checks influence one session debug variable on another
-connection con1;
-set session debug_dbug="d:t";
-show session variables like 'debug';
-connection con2;
-show session variables like 'debug';
-
-disconnect con1;
-disconnect con2;
-
-connection default;
-
-