summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormsvensson@neptunus.(none) <>2006-11-13 16:55:05 +0100
committermsvensson@neptunus.(none) <>2006-11-13 16:55:05 +0100
commit91518b335eba98b3d258cefb32e61ca632030470 (patch)
tree7caa222cfcc5177b42bc0af68fcc6a2a3c4cc34b
parentbf8a9e544c2aef5328a6d9a67d6277b988beb6fd (diff)
downloadmariadb-git-91518b335eba98b3d258cefb32e61ca632030470.tar.gz
Expect the file "have_mysql_upgrade.result" to contain the
result from "require mysql_upgrade"
-rw-r--r--mysql-test/r/have_mysql_upgrade.result2
-rw-r--r--mysql-test/t/mysql_upgrade.test2
2 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/r/have_mysql_upgrade.result b/mysql-test/r/have_mysql_upgrade.result
new file mode 100644
index 00000000000..952bea420f9
--- /dev/null
+++ b/mysql-test/r/have_mysql_upgrade.result
@@ -0,0 +1,2 @@
+have_mysql_upgrade
+1
diff --git a/mysql-test/t/mysql_upgrade.test b/mysql-test/t/mysql_upgrade.test
index 50d316a0767..4200ba844f7 100644
--- a/mysql-test/t/mysql_upgrade.test
+++ b/mysql-test/t/mysql_upgrade.test
@@ -1,5 +1,5 @@
# Only run test if "mysql_upgrade" is found
---require r/have_mysql_upgrade.inc
+--require r/have_mysql_upgrade.result
--disable_query_log
select LENGTH("$MYSQL_UPGRADE")>0 as have_mysql_upgrade;
--enable_query_log