diff --git a/ChangeLog b/ChangeLog
index 0a4b01ef4062cdd31c1651822f6ce71ed2f4ce04..060747550b10ea3814ede999730b3569083ae211 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-26	The InnoDB Team
+
+	* row/row0merge.c (row_merge_drop_temp_indexes):
+	Replace the WHILE 1 with WHILE 1=1 in the SQL procedure, so that
+	the loop will actually be entered and temporary indexes be dropped
+	during crash recovery.
+
 2008-10-31	The InnoDB Team
 
 	* dict/dict0mem.c, include/dict0mem.h, include/lock0lock.h,
diff --git a/row/row0merge.c b/row/row0merge.c
index a44e5c32d844306769183230faf853df61abc8fd..9958f934f7075239c699da08262844d096e88404 100644
--- a/row/row0merge.c
+++ b/row/row0merge.c
@@ -1821,7 +1821,7 @@ row_merge_drop_temp_indexes(void)
 		"WHERE SUBSTR(NAME,0,1)='\377' FOR UPDATE;\n"
 		"BEGIN\n"
 		"\tOPEN c;\n"
-		"\tWHILE 1 LOOP\n"
+		"\tWHILE 1=1 LOOP\n"
 		"\t\tFETCH c INTO indexid;\n"
 		"\t\tIF (SQL % NOTFOUND) THEN\n"
 		"\t\t\tEXIT;\n"