From d0bfa4afc4bed793b159a6635a4839ca550c1b4e Mon Sep 17 00:00:00 2001
From: Monty <monty@mariadb.org>
Date: Sat, 26 Jan 2019 19:11:06 +0200
Subject: [PATCH] Fixed failing testcase when blackhole engine is not enabled

---
 mysql-test/main/mysql_upgrade_noengine.test | 5 +++--
 1 file 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';