List:Commits« Previous MessageNext Message »
From:marko.makela Date:May 23 2012 12:55pm
Subject:bzr push into mysql-trunk-wl6255 branch (marko.makela:3855 to 3856)
View as plain text  
 3856 Marko Mäkelä	2012-05-23
      Remove bogus __attribute__((pure)) on indexes.
      
      An index can become corrupted between calls or its online_status may
      change between calls.

    modified:
      storage/innobase/include/dict0dict.h
 3855 Marko Mäkelä	2012-05-23
      WL#6255 preparation: Do not recompute offsets after B-tree insert.
      
      btr_root_raise_and_insert(), btr_page_insert_fits(),
      btr_page_tuple_smaller(), btr_page_split_and_insert(),
      btr_cur_insert_if_possible(), btr_cur_optimistic_insert(),
      btr_cur_pessimistic_insert(), ibuf_insert_to_index_page_low(),
      page_cur_tuple_insert(), row_ins_sec_index_entry_by_modify():
      Add in/out parameters for offsets and heap.
      
      row_ins_sec_index_entry_low(): Add a parameter for heap.

    modified:
      storage/innobase/btr/btr0btr.cc
      storage/innobase/btr/btr0cur.cc
      storage/innobase/ibuf/ibuf0ibuf.cc
      storage/innobase/include/btr0btr.h
      storage/innobase/include/btr0cur.h
      storage/innobase/include/page0cur.h
      storage/innobase/include/page0cur.ic
      storage/innobase/row/row0ins.cc
      storage/innobase/row/row0log.cc
      storage/innobase/row/row0merge.cc
=== modified file 'storage/innobase/include/dict0dict.h'
--- a/storage/innobase/include/dict0dict.h	revid:marko.makela@strippeds3dmpmzba8sy6ic
+++ b/storage/innobase/include/dict0dict.h	revid:marko.makela@strippedm82tvc
@@ -1308,7 +1308,7 @@ enum online_index_status
 dict_index_get_online_status(
 /*=========================*/
 	const dict_index_t*	index)	/*!< in: secondary index */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((nonnull, warn_unused_result));
 /********************************************************************//**
 Sets the status of online index creation. */
 UNIV_INLINE
@@ -1597,7 +1597,7 @@ ulint
 dict_table_is_corrupted(
 /*====================*/
 	const dict_table_t*	table)	/*!< in: table */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((nonnull, warn_unused_result));
 
 /**********************************************************************//**
 Check whether the index is corrupted.
@@ -1607,7 +1607,7 @@ ulint
 dict_index_is_corrupted(
 /*====================*/
 	const dict_index_t*	index)	/*!< in: index */
-	__attribute__((nonnull, pure, warn_unused_result));
+	__attribute__((nonnull, warn_unused_result));
 
 /**********************************************************************//**
 Flags an index and table corrupted both in the data dictionary cache

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk-wl6255 branch (marko.makela:3855 to 3856) marko.makela25 May