Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint

2 files changed, 12 insertions, 17 deletions

diff --git a/scripts/make_win_bin_dist b/scripts/make_win_bin_dist
index 146dcad95f1..1cd4141f532 100755
--- a/scripts/make_win_bin_dist
+++ b/scripts/make_win_bin_dist
@@ -302,6 +302,7 @@ cp mysql-test/std_data/*.cnf        $DESTDIR/mysql-test/std_data/
 cp mysql-test/std_data/*.dat        $DESTDIR/mysql-test/std_data/
 cp mysql-test/std_data/*.frm        $DESTDIR/mysql-test/std_data/
 cp mysql-test/std_data/*.pem        $DESTDIR/mysql-test/std_data/
+cp mysql-test/std_data/*.MY*        $DESTDIR/mysql-test/std_data/
 cp mysql-test/t/*.opt $DESTDIR/mysql-test/t/
 cp mysql-test/t/*.sh $DESTDIR/mysql-test/t/
 cp mysql-test/t/*.slave-mi $DESTDIR/mysql-test/t/
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index da2438c606c..808179c0750 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -135,6 +135,17 @@ else
   fi
 fi
 
+# Check that no previous MySQL installation exist
+if test -f "$ldata/mysql/db.frm"
+then
+  echo "FATAL ERROR: Found already existing MySQL system tables"
+  echo "in $ldata."
+  echo "If you are upgrading from a previous MySQL version you"
+  echo "should run '$bindir/mysql_upgrade', "
+  echo "to upgrade all tables for this version of MySQL"
+  exit 1;
+fi
+
 # Find SQL scripts needed for bootstrap
 fill_help_tables="fill_help_tables.sql"
 create_system_tables="mysql_system_tables.sql"
@@ -181,7 +192,6 @@ then
 fi
 
 # Find executables and paths
-mdata=$ldata/mysql
 mysqld=$execdir/mysqld
 mysqld_opt=""
 scriptdir=$bindir
@@ -264,12 +274,6 @@ if test -w / -a ! -z "$user"; then
   chown $user $ldata $ldata/mysql $ldata/test;
 fi
 
-# Check is "db" table already exist
-if test ! -f $mdata/db.frm
-then
-  db_table_already_exist="yes"
-fi
-
 if test -n "$user"; then
   args="$args --user=$user"
 fi
@@ -322,16 +326,6 @@ then
     echo "$bindir/mysqladmin -u root -h $hostname password 'new-password'"
     echo "See the manual for more instructions."
 
-    # Print message about upgrading unless we have created a new db table.
-    if test -z "$db_table_already_exist"
-    then
-      echo
-      echo "NOTE: If you are upgrading from a previous MySQL verision you "
-      echo "should run '$bindir/mysql_upgrade', to make sure all tables have "
-     echo "been upgraded for this version of MySQL"
-    fi
-    echo
-
     if test "$in_rpm" = "0"
     then
       echo "You can start the MySQL daemon with:"