bzr push into mysql-5.1-innodb branch (marko.makela:3459 to 3461)

[marko.makela]

 3461 Marko Mäkelä	2010-05-12
      Document recent fixes in ChangeLog.

    modified:
      storage/innodb_plugin/ChangeLog
 3460 Marko Mäkelä	2010-05-12
      row_merge_drop_temp_indexes(): Do not reference freed memory.
      (Bug #53471)

    modified:
      storage/innodb_plugin/row/row0merge.c
 3459 Marko Mäkelä	2010-05-11
      Fix sys_vars.tx_isolation_func.test, which was broken in revno 3432
      when making READ UNCOMMITTED lock as little as READ COMMITTED.

    modified:
      mysql-test/suite/sys_vars/r/tx_isolation_func.result
      mysql-test/suite/sys_vars/t/tx_isolation_func.test
=== modified file 'storage/innodb_plugin/ChangeLog'
--- a/storage/innodb_plugin/ChangeLog	2010-05-05 11:50:11 +0000
+++ b/storage/innodb_plugin/ChangeLog	2010-05-12 06:09:22 +0000
@@ -1,3 +1,19 @@
[phone]	The InnoDB Team
+
+	* row/row0merge.c:
+	Fix Bug#53471 row_merge_drop_temp_indexes() refers freed memory, SEGVs
+
[phone]	The InnoDB Team
+
+	* mysql-test/innodb_bug53290.test, mysql-test/innodb_bug53290.result,
+	include/rem0cmp.h, rem/rem0cmp.c, row/row0merge.c:
+	Fix Bug#53290 wrong duplicate key error when adding a unique index
+	via fast alter table
+
[phone]	The InnoDB Team
+	* buf/buf0lru.c, include/buf0buf.ic:
+	Fix Bug#53307 valgrind: warnings in main.partition_innodb_plugin
+
 2010-05-05	The InnoDB Team
 
 	* row/row0merge.c:

=== modified file 'storage/innodb_plugin/row/row0merge.c'
--- a/storage/innodb_plugin/row/row0merge.c	2010-05-05 12:39:01 +0000
+++ b/storage/innodb_plugin/row/row0merge.c	2010-05-12 05:39:25 +0000
@@ -2096,9 +2096,12 @@ row_merge_drop_temp_indexes(void)
 
 		if (table) {
 			dict_index_t*	index;
+			dict_index_t*	next_index;
 
 			for (index = dict_table_get_first_index(table);
-			     index; index = dict_table_get_next_index(index)) {
+			     index; index = next_index) {
+
+				next_index = dict_table_get_next_index(index);
 
 				if (*index->name == TEMP_INDEX_PREFIX) {
 					row_merge_drop_index(index, table, trx);

Attachment: [text/bzr-bundle] bzr/[e-mail]