From a7abddeffa6a760ce948c2dfb007cdf3f1a369d5 Mon Sep 17 00:00:00 2001
From: Michael Widenius <monty@mariadb.org>
Date: Fri, 9 Mar 2018 14:05:35 +0200
Subject: Create 'main' test directory and move 't' and 'r' there

---
 mysql-test/t/log_tables_debug.test | 95 --------------------------------------
 1 file changed, 95 deletions(-)
 delete mode 100644 mysql-test/t/log_tables_debug.test

(limited to 'mysql-test/t/log_tables_debug.test')

diff --git a/mysql-test/t/log_tables_debug.test b/mysql-test/t/log_tables_debug.test
deleted file mode 100644
index 971c11d458f..00000000000
--- a/mysql-test/t/log_tables_debug.test
+++ /dev/null
@@ -1,95 +0,0 @@
-### t/log_tables_debug.test
-#
-# Log-related tests requiring a debug-build server.
-#
-
-# extra clean-up required due to Bug#38124, set to 1 when behavior has
-# changed (see explanation in log_state.test)
-let $fixed_bug38124 = 0;
-
---source include/not_embedded.inc
---source include/have_debug.inc
-
-# Several subtests modify global variables. Save the initial values only here,
-# but reset to the initial values per subtest.
-SET @old_general_log= @@global.general_log;
-SET @old_general_log_file= @@global.general_log_file;
-SET @old_slow_query_log= @@global.slow_query_log;
-SET @old_slow_query_log_file= @@global.slow_query_log_file;
-
-
---echo #
---echo # Bug#45387 Information about statement id for prepared
---echo #           statements missed from general log
---echo #
-
-let MYSQLD_DATADIR= `SELECT @@datadir`;
-
-# set logging to our specific bug log to control the entries added
-SET @@global.general_log = ON;
-SET @@global.general_log_file = 'bug45387_general.log';
-
-# turn on output of timestamps on all log file entries
-SET SESSION debug_dbug='+d,reset_log_last_time';
-
-let CONN_ID= `SELECT CONNECTION_ID()`;
-FLUSH LOGS;
-
-# reset log settings
-SET @@global.general_log = @old_general_log;
-SET @@global.general_log_file = @old_general_log_file;
-SET SESSION debug_dbug='-d';
-
-perl;
-  # get the relevant info from the surrounding perl invocation
-  $datadir= $ENV{'MYSQLD_DATADIR'};
-  $conn_id= $ENV{'CONN_ID'};
-
-  # loop through the log file looking for the stmt querying for conn id
-  open(FILE, "$datadir/bug45387_general.log") or
-    die("Unable to read log file $datadir/bug45387_general.log: $!\n");
-  while(<FILE>) {
-    if (/\d{6}\s+\d+:\d+:\d+[ \t]+(\d+)[ \t]+Query[ \t]+SELECT CONNECTION_ID/) {
-      $found= $1;
-      break;
-    }
-  }
-
-  # print the result
-  if ($found == $conn_id) {
-    print "Bug#45387: ID match.\n";
-  } else {
-    print "Bug#45387: Expected ID '$conn_id', found '$found' in log file.\n";
-    print "Contents of log file:\n";
-    seek(FILE, 0, 0);
-    while($line= <FILE>) {
-      print $line;
-    }
-  }
-
-  close(FILE);
-EOF
-
---remove_file $MYSQLD_DATADIR/bug45387_general.log
-
---echo End of 5.1 tests
-
-
---echo #
---echo # Cleanup
---echo #
-
-# Reset global system variables to initial values if forgotten somewhere above.
-SET global general_log = @old_general_log;
-SET global general_log_file = @old_general_log_file;
-SET global slow_query_log = @old_slow_query_log;
-SET global slow_query_log_file = @old_slow_query_log_file;
-if(!$fixed_bug38124)
-{
-   --disable_query_log
-   let $my_var = `SELECT @old_general_log_file`;
-   eval SET @@global.general_log_file = '$my_var';
-   let $my_var = `SELECT @old_slow_query_log_file`;
-   eval SET @@global.slow_query_log_file = '$my_var';
-   --enable_query_log
-}
-- 
cgit v1.2.1