diff options
author | msvensson@pilot.blaudden <> | 2007-03-27 21:11:22 +0200 |
---|---|---|
committer | msvensson@pilot.blaudden <> | 2007-03-27 21:11:22 +0200 |
commit | 4d99906ea7edee439552cd4b20f1ccb3b96f2d6c (patch) | |
tree | 8b6e94cf17a553c2a800fbc3d04c80198d71d7cb /scripts/mysql_install_db.sh | |
parent | d993ea6c5da1bfbdddf929c7ab86d794d7ba7c66 (diff) | |
parent | cf0e52ea17bb8ea8ae95cd046dc1b2acc052377c (diff) | |
download | mariadb-git-4d99906ea7edee439552cd4b20f1ccb3b96f2d6c.tar.gz |
Merge pilot.blaudden:/home/msvensson/mysql/bug27022/my50-bug27022
into pilot.blaudden:/home/msvensson/mysql/bug27022/my51-bug27022
Diffstat (limited to 'scripts/mysql_install_db.sh')
-rw-r--r-- | scripts/mysql_install_db.sh | 28 |
1 files changed, 11 insertions, 17 deletions
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:" |