bk commit into 5.0 tree (msvensson:1.2300)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-11-13 16:55:05+01:00, msvensson@neptunus.(none) +2 -0
  Expect the file "have_mysql_upgrade.result" to contain the 
  result from "require mysql_upgrade"

  mysql-test/r/have_mysql_upgrade.result@stripped, 2006-11-13 16:55:04+01:00,
msvensson@neptunus.(none) +2 -0
    New BitKeeper file ``mysql-test/r/have_mysql_upgrade.result''

  mysql-test/r/have_mysql_upgrade.result@stripped, 2006-11-13 16:55:04+01:00,
msvensson@neptunus.(none) +0 -0

  mysql-test/t/mysql_upgrade.test@stripped, 2006-11-13 16:55:04+01:00,
msvensson@neptunus.(none) +1 -1
    Expect the file "have_mysql_upgrade.result" to contain the 
    result from "require mysql_upgrade"

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0-maint
--- New file ---
+++ mysql-test/r/have_mysql_upgrade.result	06/11/13 16:55:04
have_mysql_upgrade
1


--- 1.1/mysql-test/t/mysql_upgrade.test	2006-11-13 16:55:12 +01:00
+++ 1.2/mysql-test/t/mysql_upgrade.test	2006-11-13 16:55:12 +01:00
@@ -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