summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2021-02-01 13:44:50 +0100
committerSergei Golubchik <serg@mariadb.org>2021-02-01 13:50:22 +0100
commit251b52190070095e4c65ffb0ae545d49330a02b2 (patch)
treeec255dc9ae04dc4d61e662a6b903ae84e0f4203e
parenta7b6943ee4bd740bb42e7259abbe911273c752e3 (diff)
downloadmariadb-git-251b52190070095e4c65ffb0ae545d49330a02b2.tar.gz
main.mysqldump test isn't that big
and it is that important to be run every time
-rw-r--r--mysql-test/main/mysqldump.result6
-rw-r--r--mysql-test/main/mysqldump.test14
2 files changed, 1 insertions, 19 deletions
diff --git a/mysql-test/main/mysqldump.result b/mysql-test/main/mysqldump.result
index d8b24e4f5e7..76105ab0236 100644
--- a/mysql-test/main/mysqldump.result
+++ b/mysql-test/main/mysqldump.result
@@ -1,14 +1,10 @@
call mtr.add_suppression("@003f.frm' \\(errno: 22\\)");
+call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
# Bug#37938 Test "mysqldump" lacks various insert statements
# Turn off concurrent inserts to avoid random errors
# NOTE: We reset the variable back to saved value at the end of test
SET @OLD_CONCURRENT_INSERT = @@GLOBAL.CONCURRENT_INSERT;
SET @@GLOBAL.CONCURRENT_INSERT = 0;
-DROP TABLE IF EXISTS t1, `"t"1`, t1aa, t2, t2aa, t3;
-drop database if exists mysqldump_test_db;
-drop database if exists db1;
-drop database if exists db2;
-drop view if exists v1, v2, v3;
CREATE TABLE t1(a INT, KEY (a)) KEY_BLOCK_SIZE=1024;
INSERT INTO t1 VALUES (1), (2);
<?xml version="1.0"?>
diff --git a/mysql-test/main/mysqldump.test b/mysql-test/main/mysqldump.test
index 7362c0d1aea..3e88ff3bc39 100644
--- a/mysql-test/main/mysqldump.test
+++ b/mysql-test/main/mysqldump.test
@@ -19,12 +19,7 @@ let collation=utf8_unicode_ci;
# There are tables in 'mysql' database of type innodb
--source include/have_innodb.inc
-# This test is slow on buildbot.
---source include/big_test.inc
-
-disable_query_log;
call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
-enable_query_log;
--echo # Bug#37938 Test "mysqldump" lacks various insert statements
--echo # Turn off concurrent inserts to avoid random errors
@@ -32,15 +27,6 @@ enable_query_log;
SET @OLD_CONCURRENT_INSERT = @@GLOBAL.CONCURRENT_INSERT;
SET @@GLOBAL.CONCURRENT_INSERT = 0;
-
---disable_warnings
-DROP TABLE IF EXISTS t1, `"t"1`, t1aa, t2, t2aa, t3;
-drop database if exists mysqldump_test_db;
-drop database if exists db1;
-drop database if exists db2;
-drop view if exists v1, v2, v3;
---enable_warnings
-
# XML output
CREATE TABLE t1(a INT, KEY (a)) KEY_BLOCK_SIZE=1024;