merge

69931b14 · Sergei Golubchik · 807bc58c · 77d307f7 · 69931b14
Commit 69931b14 authored Sep 26, 2012 by Sergei Golubchik
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

scripts/mysql_install_db.sh scripts/mysql_install_db.sh +3 -1

No files found.
--- 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@`