bzr push into mysql-5.1-innodb branch (marko.makela:3405 to 3406)

[marko.makela]

 3406 Marko Makela	2010-04-20
      btr_cur_optimistic_insert(): Remove unused variable "heap".

    modified:
      storage/innodb_plugin/btr/btr0cur.c
 3405 Marko Makela	2010-04-20
      dict_create_index_step(): Invoke dict_index_add_to_cache()
      in strict mode only if innodb_strict_mode is set. (Bug #50495)
      
      trx_is_strict(): New function, for checking innodb_strict_mode.

    modified:
      storage/innodb_plugin/ChangeLog
      storage/innodb_plugin/dict/dict0crea.c
      storage/innodb_plugin/handler/ha_innodb.cc
      storage/innodb_plugin/include/trx0trx.h
=== modified file 'storage/innodb_plugin/btr/btr0cur.c'
--- a/storage/innodb_plugin/btr/btr0cur.c	2010-02-20 16:45:41 +0000
+++ b/storage/innodb_plugin/btr/btr0cur.c	2010-04-20 20:15:50 +0000
@@ -1064,7 +1064,6 @@ btr_cur_optimistic_insert(
 	ibool		inherit;
 	ulint		zip_size;
 	ulint		rec_size;
-	mem_heap_t*	heap		= NULL;
 	ulint		err;
 
 	*big_rec = NULL;
@@ -1144,10 +1143,6 @@ btr_cur_optimistic_insert(
 					index, entry, big_rec_vec);
 			}
 
-			if (heap) {
-				mem_heap_free(heap);
-			}
-
 			return(DB_TOO_BIG_RECORD);
 		}
 	}
@@ -1170,15 +1165,11 @@ fail_err:
 			dtuple_convert_back_big_rec(index, entry, big_rec_vec);
 		}
 
-		if (UNIV_LIKELY_NULL(heap)) {
-			mem_heap_free(heap);
-		}
-
 		return(err);
 	}
 
 	if (UNIV_UNLIKELY(max_size < BTR_CUR_PAGE_REORGANIZE_LIMIT
-	     || max_size < rec_size)
+			  || max_size < rec_size)
 	    && UNIV_LIKELY(page_get_n_recs(page) > 1)
 	    && page_get_max_insert_size(page, 1) < rec_size) {
 
@@ -1244,10 +1235,6 @@ fail_err:
 		}
 	}
 
-	if (UNIV_LIKELY_NULL(heap)) {
-		mem_heap_free(heap);
-	}
-
 #ifdef BTR_CUR_HASH_ADAPT
 	if (!reorg && leaf && (cursor->flag == BTR_CUR_HASH)) {
 		btr_search_update_hash_node_on_insert(cursor);


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