summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2019-01-26 19:11:06 +0200
committerMonty <monty@mariadb.org>2019-01-26 19:18:22 +0200
commitd0bfa4afc4bed793b159a6635a4839ca550c1b4e (patch)
treeab3f9b61774b160f5e2e503bed0e4f2cd08b3926
parent574cde9be44b645e876aae9cefdc82d30c88e3d5 (diff)
downloadmariadb-git-d0bfa4afc4bed793b159a6635a4839ca550c1b4e.tar.gz
Fixed failing testcase when blackhole engine is not enabled
-rw-r--r--mysql-test/main/mysql_upgrade_noengine.test5
1 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/main/mysql_upgrade_noengine.test b/mysql-test/main/mysql_upgrade_noengine.test
index e295f09eb4e..e3c3e718591 100644
--- a/mysql-test/main/mysql_upgrade_noengine.test
+++ b/mysql-test/main/mysql_upgrade_noengine.test
@@ -3,8 +3,6 @@
#
source include/have_innodb.inc;
source include/not_embedded.inc;
-source include/switch_to_mysql_user.inc;
-drop view mysql.user_bak;
if (!$HA_BLACKHOLE_SO) {
skip Need blackhole plugin;
@@ -13,6 +11,9 @@ if (!$HA_ARCHIVE_SO) {
skip Need Archive plugin;
}
+source include/switch_to_mysql_user.inc;
+drop view mysql.user_bak;
+
let $datadir= `select @@datadir`;
install soname 'ha_blackhole';