merge with 5.5

This commit is contained in:
Sergei Golubchik 2012-11-03 12:28:51 +01:00
commit 40e94a3734
210 changed files with 5896 additions and 1462 deletions

View file

@ -11,7 +11,6 @@ usr/bin/mysqlimport
usr/bin/mysqlreport
usr/bin/mysqlshow
usr/bin/mysqlslap
usr/bin/mytop
usr/bin/mysql_waitpid
usr/share/lintian/overrides/mariadb-client-10.0
usr/share/man/man1/innotop.1

View file

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