diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-10-19 11:21:35 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-10-19 11:21:35 +0200 |
| commit | 797082ca712f52437571e24962e26573d0723ad1 (patch) | |
| tree | 482e0acf37e4c8d9bcb0ad32d59fc1433b91c735 | |
| parent | 68baf07dcd985376fae9d24c12ee0ff560b61e8f (diff) | |
| download | mariadb-git-797082ca712f52437571e24962e26573d0723ad1.tar.gz | |
Fix the incorrect merge
| -rwxr-xr-x | debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch | 4 | ||||
| -rw-r--r-- | scripts/mysql_install_db.sh | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch b/debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch index e79ac71cc7b..d4e67b321b0 100755 --- a/debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch +++ b/debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch @@ -13,8 +13,8 @@ fi # Create database directories --for dir in $ldata $ldata/mysql $ldata/test -+for dir in $ldata $ldata/mysql +-for dir in "$ldata" "$ldata/mysql" "$ldata/test" ++for dir in "$ldata" "$ldata/mysql" do if test ! -d $dir then diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index 7ebd78e3b6d..91780570194 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -329,10 +329,11 @@ then cannot_find_file "$langdir/errmsg.sys" exit 1 fi + mysqld_opt="--lc-messages-dir=$langdir/.." else - langdir=english + mysqld_opt="--lc-messages=en_US" fi -mysqld_opt="--lc-messages=$langdir" + # Try to determine the hostname hostname=`@HOSTNAME@` |