summaryrefslogtreecommitdiff
path: root/storage/federatedx
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2010-08-20 10:29:26 +0300
committerMichael Widenius <monty@askmonty.org>2010-08-20 10:29:26 +0300
commit6ab5a8ac8158958389a17b2be6a25701ad338bb3 (patch)
treedec3b88747695f6f6050eb3a3110d914ada2bef0 /storage/federatedx
parent909e4eb08d7ea38cf09575756cff79648e326fd5 (diff)
downloadmariadb-git-6ab5a8ac8158958389a17b2be6a25701ad338bb3.tar.gz
Fixed valgrind errors and compiler warnings discovered by buildbot
More DBUG_ASSERT() to discover errors earlier More checking of BLOCK structures in Aria. Fixed crashing bug in Aria when doing UPDATE of several records in same block when doing table scan. storage/federatedx/ha_federatedx.cc: Added missing delete_dynamic(); This fixes the valgrind warnings about lost memory discovered by buildbot. storage/maria/ma_blockrec.c: Added debugging helper function _ma_print_block_info() to print block structure. Changed arguments to _ma_print_directory() so it can be called by _ma_print_block_info() check_directory() now also checks that empty_space on block is calculated correctly. Added some local variables to get more information about what happend when things crash. Fixed crashing bug when doing UPDATE of several records in same block when doing table scan. storage/maria/ma_key_recover.c: Simple optimization (don't call bmove_upp() if not needed); This could happen during page split. storage/maria/ma_recovery.c: Fixed compiler warning storage/maria/ma_test2.c: Run test without syncing to disk. (Not needed for this test) storage/maria/ma_write.c: More comments. Added DBUG_ASSERT() to find wrong log entires, like the one reported at LP#616344, during log file creation. storage/maria/unittest/ma_test_recovery.pl: Added extra -s to maria_chk to get it more silent. This fixes that ma_test_all.sh works again.
Diffstat (limited to 'storage/federatedx')
-rw-r--r--storage/federatedx/ha_federatedx.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/federatedx/ha_federatedx.cc b/storage/federatedx/ha_federatedx.cc
index 8296fbcd2e9..b5215b17f62 100644
--- a/storage/federatedx/ha_federatedx.cc
+++ b/storage/federatedx/ha_federatedx.cc
@@ -1791,6 +1791,8 @@ int ha_federatedx::close(void)
/* free the result set */
reset();
+ delete_dynamic(&results);
+
/* Disconnect from mysql */
if (!thd || !(txn= get_txn(thd, true)))
{