diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-03-16 11:52:30 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-03-16 11:52:30 +0100 |
| commit | 189398b359c1eb512a417c10b99f10fb2614d098 (patch) | |
| tree | b02f79b12950f0ac7c30613e2fa4357f5d0c4020 /scripts | |
| parent | d6bd171fd2ecf9a58c2dcd3f34b9b248c7ac62ba (diff) | |
| download | mariadb-git-189398b359c1eb512a417c10b99f10fb2614d098.tar.gz | |
Bug#27022 Install fails with Duplicate entry '%-test-' for key 'PRIMARY'
- Bail out with error if MySQL System tables already exist
scripts/mysql_install_db.sh:
Bail out with error if the MySQL system tables already exist
in the location where we want to install
Diffstat (limited to 'scripts')
| -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 5dd5d86c666..c1a27eb0bc8 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:" |