summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2016-06-22 00:24:42 +0200
committerSergei Golubchik <serg@mariadb.org>2016-06-22 10:40:43 +0200
commita10fd659aacd3a23386e5ff61a8c0ef9165690a3 (patch)
tree9f83c346211a2d79af82726031b8516a328cf14f /storage
parent805703fa8e9dd2dc09b9e3a2b8d7786e541621ff (diff)
downloadmariadb-git-a10fd659aacd3a23386e5ff61a8c0ef9165690a3.tar.gz
Fixed for failures in buildbot: Replication
1. remove unnecessary rpl-tokudb combination file. 2. fix rpl_ignore_table to cleanup properly (not leave test grants in memory) 3. check_temp_dir() is supposed to set the error in stmt_da - do it even when called multiple times, this fixes a crash when rpl.rpl_slave_load_tmpdir_not_exist is run twice.
Diffstat (limited to 'storage')
-rw-r--r--storage/tokudb/mysql-test/rpl/combinations8
1 files changed, 0 insertions, 8 deletions
diff --git a/storage/tokudb/mysql-test/rpl/combinations b/storage/tokudb/mysql-test/rpl/combinations
deleted file mode 100644
index 07042c2cbec..00000000000
--- a/storage/tokudb/mysql-test/rpl/combinations
+++ /dev/null
@@ -1,8 +0,0 @@
-[row]
-binlog-format=row
-
-[stmt]
-binlog-format=statement
-
-[mix]
-binlog-format=mixed