diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-11-03 12:28:51 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-11-03 12:28:51 +0100 |
| commit | 40e94a3734b1daa254810c4be64e17b84dbbc2a2 (patch) | |
| tree | 5e14dfc106276445caf85dc76c8034c8b0df11b4 /debian | |
| parent | 247e654fa7e04dd0c5181c2241470f56749d2a99 (diff) | |
| parent | 4ffc9c3b01459a2904a7154a6c750d128864fc7b (diff) | |
| download | mariadb-git-40e94a3734b1daa254810c4be64e17b84dbbc2a2.tar.gz | |
merge with 5.5
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/mariadb-client-10.0.files | 1 | ||||
| -rwxr-xr-x | debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/debian/mariadb-client-10.0.files b/debian/mariadb-client-10.0.files index 2c6c38f853e..ac68079718e 100644 --- a/debian/mariadb-client-10.0.files +++ b/debian/mariadb-client-10.0.files @@ -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 diff --git a/debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch b/debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch index e79ac71cc7b..d4e67b321b0 100755 --- a/debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch +++ b/debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch @@ -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 |