From: kevin.lewis
Date: December 9 2010 5:08pm
Subject: bzr push into mysql-5.5-innodb branch (kevin.lewis:3257 to 3258)
List-Archive: http://lists.mysql.com/commits/126465
Message-Id: <20101209170835.C0C11876681@kevin-lewis-macbook.local>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3258 kevin.lewis@stripped	2010-12-09
      55222 - Previous patch had a bug in unused code which was reactivated in
      mysql-trunk-innodb in rev revno: 3367  Tue 2010-12-07 02:25:25-0800.
      The crash happens only when lower_case_table_names=2, such as on MacOS,
      when running the new testcase innodb-system-table-view.  Specifically,
      it crashes when any query is made against the INFORMATION_SCHEMA.
      INNODB_SYS_FOREIGN table.  The function dict_process_sys_foreign_rec()
      is only used for displaying SYS_FOREIGN records so it does not need a
      lookup version of those names to be allocated. In this patch, those new
      function calls are deleted.

    modified:
      storage/innobase/dict/dict0load.c
 3257 Jimmy Yang	2010-12-09 [merge]
      Merge from mysql-5.1-innodb to mysql-5.5-innodb.

    modified:
      storage/innobase/buf/buf0lru.c
=== modified file 'storage/innobase/dict/dict0load.c'
--- a/storage/innobase/dict/dict0load.c	revid:jimmy.yang@stripped
+++ b/storage/innobase/dict/dict0load.c	revid:kevin.lewis@stripped
@@ -441,7 +441,7 @@ dict_process_sys_fields_rec(
 /********************************************************************//**
 This function parses a SYS_FOREIGN record and populate a dict_foreign_t
 structure with the information from the record. For detail information
-about SYS_FOREIGN fields, please refer to dict_load_foreign() function
+about SYS_FOREIGN fields, please refer to dict_load_foreign() function.
 @return error message, or NULL on success */
 UNIV_INTERN
 const char*
@@ -469,6 +469,11 @@ dict_process_sys_foreign_rec(
 err_len:
 		return("incorrect column length in SYS_FOREIGN");
 	}
+	
+	/* This recieves a dict_foreign_t* that points to a stack variable.
+	So mem_heap_free(foreign->heap) is not used as elsewhere.
+	Since the heap used here is freed elsewhere, foreign->heap
+	is not assigned. */
 	foreign->id = mem_heap_strdupl(heap, (const char*) field, len);
 
 	rec_get_nth_field_offs_old(rec, 1/*DB_TRX_ID*/, &len);
@@ -480,22 +485,22 @@ err_len:
 		goto err_len;
 	}
 
+	/* The _lookup versions of the referenced and foreign table names
+	 are not assigned since they are not used in this dict_foreign_t */
+
 	field = rec_get_nth_field_old(rec, 3/*FOR_NAME*/, &len);
 	if (UNIV_UNLIKELY(len < 1 || len == UNIV_SQL_NULL)) {
 		goto err_len;
 	}
 	foreign->foreign_table_name = mem_heap_strdupl(
 		heap, (const char*) field, len);
-	dict_mem_foreign_table_name_lookup_set(foreign, TRUE);
 
 	field = rec_get_nth_field_old(rec, 4/*REF_NAME*/, &len);
 	if (UNIV_UNLIKELY(len < 1 || len == UNIV_SQL_NULL)) {
 		goto err_len;
 	}
-
 	foreign->referenced_table_name = mem_heap_strdupl(
 		heap, (const char*) field, len);
-	dict_mem_referenced_table_name_lookup_set(foreign, TRUE);
 
 	field = rec_get_nth_field_old(rec, 5/*N_COLS*/, &len);
 	if (UNIV_UNLIKELY(len != 4)) {

No bundle (reason: useless for push emails).