summaryrefslogtreecommitdiff
path: root/mysql-test/suite/binlog_encryption
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2021-03-06 12:18:48 +0100
committerSergei Golubchik <serg@mariadb.org>2021-03-08 15:00:45 +0100
commitcf1ca57e75de0a06349d13813146396c4b0e3a9d (patch)
tree3d594394bf9f9f4824702413a5c74a67b3c03382 /mysql-test/suite/binlog_encryption
parent44b85406b8b46977ef291daee697ef0c399b9560 (diff)
downloadmariadb-git-cf1ca57e75de0a06349d13813146396c4b0e3a9d.tar.gz
cleanup: renames, no need to create a new .inc file
if it's the whole content of a test anyway.
Diffstat (limited to 'mysql-test/suite/binlog_encryption')
-rw-r--r--mysql-test/suite/binlog_encryption/binlog_write_error.result19
-rw-r--r--mysql-test/suite/binlog_encryption/binlog_write_error.test2
2 files changed, 1 insertions, 20 deletions
diff --git a/mysql-test/suite/binlog_encryption/binlog_write_error.result b/mysql-test/suite/binlog_encryption/binlog_write_error.result
index 6e8a212035a..f37351770ac 100644
--- a/mysql-test/suite/binlog_encryption/binlog_write_error.result
+++ b/mysql-test/suite/binlog_encryption/binlog_write_error.result
@@ -1,15 +1,4 @@
#
-# Initialization
-#
-DROP TABLE IF EXISTS t1, t2;
-DROP FUNCTION IF EXISTS f1;
-DROP FUNCTION IF EXISTS f2;
-DROP PROCEDURE IF EXISTS p1;
-DROP PROCEDURE IF EXISTS p2;
-DROP TRIGGER IF EXISTS tr1;
-DROP TRIGGER IF EXISTS tr2;
-DROP VIEW IF EXISTS v1, v2;
-#
# Test injecting binlog write error when executing queries
#
set @saved_dbug = @@global.debug_dbug;
@@ -115,11 +104,3 @@ DROP USER user1;
DROP USER user1;
ERROR HY000: Error writing file 'master-bin' ((errno: #)
set @@global.debug_dbug = @saved_dbug;
-#
-# Cleanup
-#
-DROP TABLE IF EXISTS t1, t2;
-DROP FUNCTION IF EXISTS f1;
-DROP PROCEDURE IF EXISTS p1;
-DROP TRIGGER IF EXISTS tr1;
-DROP VIEW IF EXISTS v1, v2;
diff --git a/mysql-test/suite/binlog_encryption/binlog_write_error.test b/mysql-test/suite/binlog_encryption/binlog_write_error.test
index 68e59655eab..8add24da984 100644
--- a/mysql-test/suite/binlog_encryption/binlog_write_error.test
+++ b/mysql-test/suite/binlog_encryption/binlog_write_error.test
@@ -1 +1 @@
---source suite/binlog/include/binlog_write_error.inc
+--source suite/binlog/t/binlog_write_error.test