diff options
| author | unknown <knielsen@knielsen-hq.org> | 2012-01-31 08:57:59 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2012-01-31 08:57:59 +0100 |
| commit | b6a82a7c5a6b596e8e4cd4deb1cdbc3d63163231 (patch) | |
| tree | af040f04e5974ac02d6ee0c2431e973ef7177033 /debian/dist | |
| parent | 2abc4c4896f2ea1bc8e72087c95068168d67d590 (diff) | |
| download | mariadb-git-b6a82a7c5a6b596e8e4cd4deb1cdbc3d63163231.tar.gz | |
Fix .deb install failure when PBXT is not built-in.
Fix egrep syntax error in .deb preinst.
Diffstat (limited to 'debian/dist')
| -rw-r--r-- | debian/dist/Debian/mariadb-server-5.5.postinst | 2 | ||||
| -rw-r--r-- | debian/dist/Ubuntu/mariadb-server-5.5.postinst | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/debian/dist/Debian/mariadb-server-5.5.postinst b/debian/dist/Debian/mariadb-server-5.5.postinst index 60365711ebf..e3f2df13b4b 100644 --- a/debian/dist/Debian/mariadb-server-5.5.postinst +++ b/debian/dist/Debian/mariadb-server-5.5.postinst @@ -21,7 +21,7 @@ invoke() { fi } -MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables --innodb=OFF --pbxt=OFF --default-storage-engine=myisam" +MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables --loose-innodb=OFF --loose-pbxt=OFF --default-storage-engine=myisam" test_mysql_access() { mysql --no-defaults -u root -h localhost </dev/null >/dev/null 2>&1 diff --git a/debian/dist/Ubuntu/mariadb-server-5.5.postinst b/debian/dist/Ubuntu/mariadb-server-5.5.postinst index 68e24a2d833..a0c351194bb 100644 --- a/debian/dist/Ubuntu/mariadb-server-5.5.postinst +++ b/debian/dist/Ubuntu/mariadb-server-5.5.postinst @@ -21,7 +21,7 @@ invoke() { fi } -MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables --innodb=OFF --pbxt=OFF --default-storage-engine=myisam" +MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables --loose-innodb=OFF --loose-pbxt=OFF --default-storage-engine=myisam" test_mysql_access() { mysql --no-defaults -u root -h localhost </dev/null >/dev/null 2>&1 |