bk commit into 5.1 tree (df:1.2634)

[Daniel Fischer]

Below is the list of changes that have just been committed into a local
5.1 repository of df. When df 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, 2007-12-10 12:21:02+01:00, df@stripped +1 -0
  after-merge fix

  scripts/mysql_install_db.sh@stripped, 2007-12-10 12:21:00+01:00, df@stripped +1 -1
    after-merge fix

diff -Nrup a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
--- a/scripts/mysql_install_db.sh	2007-12-10 12:16:38 +01:00
+++ b/scripts/mysql_install_db.sh	2007-12-10 12:21:00 +01:00
@@ -378,7 +378,7 @@ fi
 
 # Don't output verbose information if running inside bootstrap or using
 # --srcdir for testing.
-if test "$windows" -eq 0 && test -z "$srcdir"
+if test "$cross_bootstrap" -eq 0 && test -z "$srcdir"
 then
   s_echo
   s_echo "To start mysqld at boot time you have to copy"