From ab15fb9e9080d21bb84a8e8ceb8d86129c669972 Mon Sep 17 00:00:00 2001
From: unknown <msvensson@neptunus.(none)>
Date: Mon, 13 Nov 2006 16:55:05 +0100
Subject: [PATCH] Expect the file "have_mysql_upgrade.result" to contain the
 result from "require mysql_upgrade"

mysql-test/r/have_mysql_upgrade.result:
  New BitKeeper file ``mysql-test/r/have_mysql_upgrade.result''
---
 mysql-test/r/have_mysql_upgrade.result | 2 ++
 mysql-test/t/mysql_upgrade.test        | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 mysql-test/r/have_mysql_upgrade.result

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