From: marko.makela
Date: April 20 2010 8:25pm
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3405 to 3406)
List-Archive: http://lists.mysql.com/commits/106161
Message-Id: <201004202026.o3KKQ2hW009715@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0032120720=="

--===============0032120720==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 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);


--===============0032120720==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/marko.makela@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marko.makela@stripped
# target_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# testament_sha1: 5e1f819ac8108dc9de2339babb1b0bdc8db09899
# timestamp: 2010-04-20 23:25:57 +0300
# base_revision_id: marko.makela@stripped\
#   diq7h2hiom9ww6me
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVP2bwYAAbbfgEAwU2P//1MC
EAC/7//0UAPZeNw3djp1du13hJIpgR6o9R6T9KepmTQh5QAZAAkkKeRppojU2oAAAANAAaaERTbR
E/SmZEeoBtQaaeoGgBgNAAANAAAAAAElCaAjNTBNDTU2ij9KeptQGmj1HqSZhXbo2VnLwGOt0pBT
MbqSrC+NzQKBr4M8ms78ZcgsmSQmXknw8TpKVMoFfPATg0I16uiTfmWgbz/OvA4n0YU82Fr8dcbT
PW/BzNx7kD3871oZDlMcc2toW41hJKg/IdA1CfIGSry9sbZTdsUBGQi6wlxfij9zxooYmMK8c3vS
e2xllYhgLEJZnAniM5AcSBNcN2lq5+oUomZ3160DlhzcnCg0GkVLi6M+z9CCcSYhDgMckscXqtpq
C3VBwLhQM426B+hIQKagg1rSJhXGZrioJ1NBB2d7oDyYbxANv0bzQ851Kl7FoaL7i/IIPJBU1jEs
MZDIGC1NJNM/NoyD7swqNkec6YJcPBkOvCIrfsoFhiHFWmqD87MyhMkWmdYKuOYWp4riw/dqTljh
FpPqOgGyqdFEIkTaFUXqeMfYENoOuJm7C4vLSV0jggSJ1APeXbTMRjN3rg6nCBCmysY5VJOQCWid
eJ07+BiwtjF9TaxSMw2uH3FLto3eLRURZWmmAQLWUI4F0E6DKyjMmZMCJ1HXXJ2lb1eFYtBwjiee
+2kRVQXFREHjoIlrIPITzUC9Z50LUJmjQ4mNpmE8+7TwhvLP0AYag6F+8VQOMLvgdhdgtDIXmiWN
trmCGUiOk6/qGnsDAeTUE1otlAp3h3m8QWYo6uluXke9IrgM01nI3ERslmPYe9mlBEHxNIdZCY5H
CP3SPLbUxGcKqDAKeBClPmAkTq5wtUGnEvKw7lpGUlIvfZtNPU5ZbKRQFJEX9abrtybUDZ8nPFpV
S1axmh0dYojeXWA5Xcgnvl/mEUe1QAo1K8D0IlztK1vSKQ0pEqwSKBZRoEMp8rtEmKFkI/Lrz3HJ
qlZvgEPszpqlbRUJxhaUSob6BAByuGlGv6VkASgdUboRD67xD0xgGLkcPAjMJl2aqroZUOsMMMFs
eTBdlKQ0Paa1X1ViZa0zpCW6YZSFTmheyfCcXJFim1gEEch0VFCgmYlOcFFI6gnGAFSlMIo8Qkrn
6+WBd7FWu1EcdEyBpeFi1pNemIsquNO65W2b4S4c2h6hjWB8Coucvm8XorEpl5iqsZmttE0sQoff
RH1n8XckU4UJBT9m8GA=


--===============0032120720==--