bzr commit into mysql-5.1-innodb branch (marko.makela:3460) Bug#53471

[marko.makela]

#At file:///home/marko/innobase/dev/mysql-5.1-innodb2/ based on revid:marko.makela@strippedeixftgzpfqt

 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
=== 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]