Commit 797082ca authored by Sergei Golubchik's avatar Sergei Golubchik

Fix the incorrect merge

parent 68baf07d
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
fi fi
# Create database directories # Create database directories
-for dir in $ldata $ldata/mysql $ldata/test -for dir in "$ldata" "$ldata/mysql" "$ldata/test"
+for dir in $ldata $ldata/mysql +for dir in "$ldata" "$ldata/mysql"
do do
if test ! -d $dir if test ! -d $dir
then then
...@@ -329,10 +329,11 @@ then ...@@ -329,10 +329,11 @@ then
cannot_find_file "$langdir/errmsg.sys" cannot_find_file "$langdir/errmsg.sys"
exit 1 exit 1
fi fi
mysqld_opt="--lc-messages-dir=$langdir/.."
else else
langdir=english mysqld_opt="--lc-messages=en_US"
fi fi
mysqld_opt="--lc-messages=$langdir"
# Try to determine the hostname # Try to determine the hostname
hostname=`@HOSTNAME@` hostname=`@HOSTNAME@`
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment