summaryrefslogtreecommitdiff
path: root/storage/maria/ma_close.c
diff options
context:
space:
mode:
authorGuilhem Bichot <guilhem@mysql.com>2008-10-15 14:44:31 +0200
committerGuilhem Bichot <guilhem@mysql.com>2008-10-15 14:44:31 +0200
commit5aa1e3b364baf49075c9c1e827ba30488561de96 (patch)
tree541ec76614aed42dbf98eee44c8138beb1e39a16 /storage/maria/ma_close.c
parent8ecda6cd2689defacec4c6c7aaeebaf2c7f78cfb (diff)
downloadmariadb-git-5aa1e3b364baf49075c9c1e827ba30488561de96.tar.gz
Small fixes for pushbuild: compiler warnings, checking that partitioning is enabled when testing it.
Don't fsync() index file when closing Maria table if not transactional. mysql-test/suite/maria/r/maria.result: piece moved mysql-test/suite/maria/r/maria_partition.result: result mysql-test/suite/maria/t/maria.test: - reset default storage engine at end of test, not in the middle - move piece which requires partitioning, to maria_partition.test, otherwise test fails on builds without partitioning compiled in mysql-test/suite/maria/t/maria_partition.test: new test for those Maria bugs which are specific of partitioning mysys/my_uuid.c: compiler warning fix (fix imported from latest 5.1-main) storage/maria/ma_close.c: don't fsync() index file when closing table if not transactional (same test as in _ma_once_end_block_record() when fsync-ing data file) storage/maria/ma_create.c: compiler warning fix (char* assigned to uchar*) storage/maria/ma_loghandler.c: compiler warning fix (char* assigned to uchar*)
Diffstat (limited to 'storage/maria/ma_close.c')
-rw-r--r--storage/maria/ma_close.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/maria/ma_close.c b/storage/maria/ma_close.c
index 266a095dd52..9463ad8078d 100644
--- a/storage/maria/ma_close.c
+++ b/storage/maria/ma_close.c
@@ -107,7 +107,7 @@ int maria_close(register MARIA_HA *info)
File must be synced as it is going out of the maria_open_list and so
becoming unknown to future Checkpoints.
*/
- if (!share->temporary && my_sync(share->kfile.file, MYF(MY_WME)))
+ if (share->now_transactional && my_sync(share->kfile.file, MYF(MY_WME)))
error= my_errno;
if (my_close(share->kfile.file, MYF(0)))
error= my_errno;