summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Widenius <monty@mysql.com>2010-08-12 20:55:00 +0300
committerMichael Widenius <monty@mysql.com>2010-08-12 20:55:00 +0300
commit6795a545e382a2de7104cdc57e0a2834e4aa9b67 (patch)
tree521a427f9a75b7551e741134eba5d5d3bfdb9a23
parentae6c5d0de310f75551586b440824ffb5a13270e3 (diff)
downloadmariadb-git-6795a545e382a2de7104cdc57e0a2834e4aa9b67.tar.gz
Trivial optimizations and cleanups
-rw-r--r--storage/maria/ma_bitmap.c2
-rw-r--r--storage/maria/ma_checkpoint.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/storage/maria/ma_bitmap.c b/storage/maria/ma_bitmap.c
index f75df06cadc..cec7cd782be 100644
--- a/storage/maria/ma_bitmap.c
+++ b/storage/maria/ma_bitmap.c
@@ -365,8 +365,8 @@ my_bool _ma_bitmap_flush_all(MARIA_SHARE *share)
*/
if (bitmap->changed)
{
- res= write_changed_bitmap(share, bitmap);
bitmap->changed= FALSE;
+ res= write_changed_bitmap(share, bitmap);
}
/*
We do NOT use FLUSH_KEEP_LAZY because we must be sure that bitmap
diff --git a/storage/maria/ma_checkpoint.c b/storage/maria/ma_checkpoint.c
index 6d1a6332c54..8a6e2b5d960 100644
--- a/storage/maria/ma_checkpoint.c
+++ b/storage/maria/ma_checkpoint.c
@@ -827,7 +827,6 @@ static int collect_tables(LEX_STRING *str, LSN checkpoint_start_log_horizon)
not seen again in the loop.
*/
share->in_checkpoint= MARIA_CHECKPOINT_LOOKS_AT_ME;
- /** @todo avoid strlen() */
total_names_length+= share->open_file_name.length;
}
}