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 /storage/xtradb | |
| 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 'storage/xtradb')
| -rw-r--r-- | storage/xtradb/handler/ha_innodb.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc index a50e631de32..dacaf6fae9c 100644 --- a/storage/xtradb/handler/ha_innodb.cc +++ b/storage/xtradb/handler/ha_innodb.cc @@ -3082,7 +3082,7 @@ innobase_change_buffering_inited_ok: #endif #ifdef HAVE_POSIX_FALLOCATE - srv_use_posix_fallocate = (ibool) innobase_use_fallocate; + srv_use_posix_fallocate = 0 && (ibool) innobase_use_fallocate; #endif srv_use_atomic_writes = (ibool) innobase_use_atomic_writes; if (innobase_use_atomic_writes) { |