diff options
| author | unknown <knielsen@knielsen-hq.org> | 2013-04-16 17:36:40 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2013-04-16 17:36:40 +0200 |
| commit | 0508f766b44fc669fbdb353a372b56b1c8e4a588 (patch) | |
| tree | 3eb66033558a18d30520b04b18e23303118d21c4 /debian | |
| parent | 82eedf4e9745aa570b88b225941120475f9f74c9 (diff) | |
| download | mariadb-git-0508f766b44fc669fbdb353a372b56b1c8e4a588.tar.gz | |
Fixes for stuff seen in buildbot:
- Fix embedded build
- Backport disable of fallocate, it creates too short ibdata1
when used with O_DIRECT on old kernels
- Do not disable innodb during .deb install, we need it for
mysql.rpl_slave_state table.
Diffstat (limited to 'debian')
| -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 4da8979fd03..69259c9fb04 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 --loose-innodb=OFF --default-storage-engine=myisam" +MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables --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 1c7aa37f69f..6a4d6b5c0d9 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 --loose-innodb=OFF --default-storage-engine=myisam" +MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables --default-storage-engine=myisam" test_mysql_access() { mysql --no-defaults -u root -h localhost </dev/null >/dev/null 2>&1 |