database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-09 22:24:09 +03:00
Code Activity

Fix the incorrect merge

Browse Source
This commit is contained in:
Sergei Golubchik
2012-10-19 11:21:35 +02:00
parent 68baf07dcd
commit 797082ca71
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch vendored
View File

@@ -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

5
scripts/mysql_install_db.sh
View File

@@ -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@`