summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2012-09-27 15:02:17 +0200
committerSergei Golubchik <sergii@pisem.net>2012-09-27 15:02:17 +0200
commit352d7cad1b891187ef50c43712aa66824576e848 (patch)
tree782f83c4f5056255f7e3e8609950fdd8211244ea /scripts
parent8c2bb705f11956cdc0acb67182466a903dcdd19b (diff)
parent807f537f328c284cd2834e8a860f39f516474ff6 (diff)
downloadmariadb-git-352d7cad1b891187ef50c43712aa66824576e848.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 6b2c20eb6a2..4da9a74ce40 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@`