summaryrefslogtreecommitdiff
path: root/mysql-test/t
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2012-02-23 16:51:58 +0200
committerMichael Widenius <monty@askmonty.org>2012-02-23 16:51:58 +0200
commitd395d2514d872bc40374e900979825f81f992890 (patch)
tree604317d3fde66b503527f0af0f71f559c9767927 /mysql-test/t
parent2b625ac3e0b2173df18c69df63af00dd03e8c672 (diff)
downloadmariadb-git-d395d2514d872bc40374e900979825f81f992890.tar.gz
Fixes for make_binary_distribution and mysql_config for OpenSuse 12.1
BUILD/SETUP.sh: By default, build also with innodb-plugin mysql-test/mysql-test-run.pl: Also search in lib64 directory for plugins (This is used at least on OpenSuse 12.1 when using default build scripts) mysql-test/r/lock_multi.result: Allow test to be re-run even if it crashed. mysql-test/t/lock_multi.test: Allow test to be re-run even if it crashed. scripts/make_binary_distribution.sh: Ensure that libexecdir is named libexec (was not on OpenSuse 12.1) scripts/mysql_config.sh: Fixed detection of lib64 was used.
Diffstat (limited to 'mysql-test/t')
-rw-r--r--mysql-test/t/lock_multi.test1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/lock_multi.test b/mysql-test/t/lock_multi.test
index f05821af5a8..044af931489 100644
--- a/mysql-test/t/lock_multi.test
+++ b/mysql-test/t/lock_multi.test
@@ -5,6 +5,7 @@
--disable_warnings
drop table if exists t1,t2;
+drop DATABASE if exists mysqltest_1;
--enable_warnings
# Test to see if select will get the lock ahead of low priority update