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

[marko.makela]

#At file:///home/marko/innobase/dev/mysql/5.5-innodb/ based on revid:marko.makela@stripped9se3179cx1

 3068 Marko Mäkelä	2010-05-05
      Merge from mysql-5.1-innodb:
      
        ------------------------------------------------------------
        revno: 3450
        revision-id: marko.makela@stripped112411-qgnn6butka20dn7p
        parent: [e-mail]-20100505104425-39y6qbffgotrhck2
        committer: Marko Mäkelä <marko.makela@stripped>
        branch nick: 5.1-innodb
        timestamp: Wed 2010-05-05 14:24:11 +0300
        message:
          row_merge_drop_temp_indexes(): Load the table via the dictionary cache.
          Allow multiple indexes to be dropped. (Bug #53256)
        ------------------------------------------------------------

    modified:
      storage/innobase/row/row0merge.c
=== modified file 'storage/innobase/row/row0merge.c'
--- a/storage/innobase/row/row0merge.c	2010-05-04 10:21:33 +0000
+++ b/storage/innobase/row/row0merge.c	2010-05-05 12:11:13 +0000
@@ -2111,7 +2111,7 @@ row_merge_drop_temp_indexes(void)
 		btr_pcur_store_position(&pcur, &mtr);
 		btr_pcur_commit_specify_mtr(&pcur, &mtr);
 
-		table = dict_load_table_on_id(table_id);
+		table = dict_table_get_on_id_low(table_id);
 
 		if (table) {
 			dict_index_t*	index;

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