summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2012-09-26 18:49:38 +0200
committerSergei Golubchik <sergii@pisem.net>2012-09-26 18:49:38 +0200
commit95875780e78f5279697d63a6952dbd19ced33776 (patch)
treed1efafdae0dd3d27c50b46d4e935b02ba41c36cd /scripts
parent22c5ffde30008c8f9127db60a99812cd311860ab (diff)
parent1f2f353cd6df4b5af5134aa9011e02bc3b0a3f89 (diff)
downloadmariadb-git-95875780e78f5279697d63a6952dbd19ced33776.tar.gz
merge
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysql_install_db.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index b6f404400f9..23eadd8312b 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -329,8 +329,10 @@ then
cannot_find_file "$langdir/errmsg.sys"
exit 1
fi
- mysqld_opt="--language=$langdir"
+else
+ langdir=english
fi
+mysqld_opt="--language=$langdir"
# Try to determine the hostname
hostname=`@HOSTNAME@`