From 9daa40cc221a48bcc9a70aa9dc16f3cba4326e38 Mon Sep 17 00:00:00 2001
From: vasil <>
Date: Mon, 6 Oct 2008 07:00:19 +0000
Subject: [PATCH] branches/zip:

Add more ChangeLog entries from the merge
of 2702:2722 from branches/5.1 (r2723).
---
 ChangeLog | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index a1e9e5ec6e3..f2ef9e415c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2008-10-04	The InnoDB Team
+
+	* handler/ha_innodb.cc, mysql-test/innodb_bug39438-master.opt,
+	mysql-test/innodb_bug39438.result, mysql-test/innodb_bug39438.test:
+	Fix Bug#39438 Testcase for Bug#39436 crashes on 5.1 in
+	fil_space_get_latch
+
+2008-10-04	The InnoDB Team
+
+	* include/lock0lock.h, lock/lock0lock.c,
+	mysql-test/innodb_bug38231.result, mysql-test/innodb_bug38231.test,
+	row/row0mysql.c:
+	Fix Bug#38231 Innodb crash in lock_reset_all_on_table() on TRUNCATE +
+	LOCK / UNLOCK
+
+2008-10-04	The InnoDB Team
+
+	* handler/ha_innodb.cc:
+	Fix Bug#35498 Cannot get table test/table1 auto-inccounter value in
+	::info
+
 2008-10-04	The InnoDB Team
 
 	* handler/ha_innodb.cc, handler/ha_innodb.h: