bzr push into mysql-trunk-innodb branch (marko.makela:3272 to 3273) Bug#56680

[marko.makela]

 3273 Marko Mäkelä	2010-10-21
      row_search_for_mysql(): Avoid recomputing offsets for DB_ROW_ID.
      I noticed this when working on Bug #56680.
      We can pass result_rec to row_sel_store_row_id_to_prebuilt(),
      just like we pass it to row_sel_store_mysql_rec().

    modified:
      storage/innobase/row/row0sel.c
 3272 Jimmy Yang	2010-10-21
      Move MONITOR_TABLE_CLOSE from dict_table_close() to ha_innobase::close().
      This is to keep the counter counting number MySQL close request, while
      dictionary LRU change has changed the usage dict_table_close() for InnoDB
      table open and close counts. This keeps the innodb_monitor.test result
      to be consistent with its existing ones.

    modified:
      storage/innobase/dict/dict0dict.c
      storage/innobase/handler/ha_innodb.cc
=== modified file 'storage/innobase/row/row0sel.c'
--- a/storage/innobase/row/row0sel.c	revid:jimmy.yang@stripped
+++ b/storage/innobase/row/row0sel.c	revid:[e-mail]-20101021090228-vpwbpnqc2ao24hhg
@@ -4468,13 +4468,10 @@ requires_clust_rec:
 		}
 
 		if (prebuilt->clust_index_was_generated) {
-			if (result_rec != rec) {
-				offsets = rec_get_offsets(
-					rec, index, offsets, ULINT_UNDEFINED,
-					&heap);
-			}
-			row_sel_store_row_id_to_prebuilt(prebuilt, rec,
-							 index, offsets);
+			row_sel_store_row_id_to_prebuilt(
+				prebuilt, result_rec,
+				result_rec == rec ? index : clust_index,
+				offsets);
 		}
 	}
 

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