bzr commit into mysql-trunk-innodb branch (marko.makela:3087)

[marko.makela]

#At file:///home/marko/innobase/dev/mysql/5.5-innodb/ based on revid:sunny.bains@strippedcpp3zolfx

 3087 Marko Mäkelä	2010-05-12
      Merge from mysql-5.1-innodb:
      
        ------------------------------------------------------------
        revno: 3460
        revision-id: marko.makela@stripped53925-ovwmpo0838fs2roo
        parent: [e-mail]-20100511165845-lsw7seixftgzpfqt
        committer: Marko Mäkelä <marko.makela@stripped>
        branch nick: mysql-5.1-innodb
        timestamp: Wed 2010-05-12 08:39:25 +0300
        message:
          row_merge_drop_temp_indexes(): Do not reference freed memory.
          (Bug #53471)

    modified:
      storage/innobase/row/row0merge.c
=== modified file 'storage/innobase/row/row0merge.c'
--- a/storage/innobase/row/row0merge.c	2010-05-11 16:18:28 +0000
+++ b/storage/innobase/row/row0merge.c	2010-05-12 06:21:46 +0000
@@ -2120,9 +2120,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]