From cd653f78fb01653a0b147916b7669de8201fb648 Mon Sep 17 00:00:00 2001
From: marko <>
Date: Mon, 21 Dec 2009 08:46:14 +0000
Subject: [PATCH] branches/zip: recv_scan_log_recs(): Non-functional change:
 Replace a debug assertion ut_ad(len > 0) with ut_ad(len >=
 OS_FILE_LOG_BLOCK_SIZE).

This change is only for readability, for Issue #428.  Another
assertion on len being an integer multiple of OS_FILE_LOG_BLOCK_SIZE
already ensured together with the old ut_ad(len > 0) that actually len
must be at least OS_FILE_LOG_BLOCK_SIZE.
---
 log/log0recv.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/log/log0recv.c b/log/log0recv.c
index 0aff9fcd9bf..b060c9e6e24 100644
--- a/log/log0recv.c
+++ b/log/log0recv.c
@@ -2558,7 +2558,7 @@ recv_scan_log_recs(
 
 	ut_ad(start_lsn % OS_FILE_LOG_BLOCK_SIZE == 0);
 	ut_ad(len % OS_FILE_LOG_BLOCK_SIZE == 0);
-	ut_ad(len > 0);
+	ut_ad(len >= OS_FILE_LOG_BLOCK_SIZE);
 	ut_a(store_to_hash <= TRUE);
 
 	finished = FALSE;
@@ -3264,6 +3264,8 @@ recv_recovery_from_checkpoint_finish(void)
 
 	/* Drop partially created indexes. */
 	row_merge_drop_temp_indexes();
+	/* Drop temporary tables. */
+	row_mysql_drop_temp_tables();
 
 #ifdef UNIV_SYNC_DEBUG
 	/* Wait for a while so that created threads have time to suspend