mirror of
https://github.com/MariaDB/server.git
synced 2025-08-09 22:24:09 +03:00
Fix the incorrect merge
This commit is contained in:
@@ -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
|
||||
|
@@ -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@`
|
||||
|
Reference in New Issue
Block a user