From: kevin.lewis Date: December 7 2010 11:38pm Subject: bzr commit into mysql-trunk-innodb branch (kevin.lewis:3368) Bug#55222 List-Archive: http://lists.mysql.com/commits/126273 X-Bug: 55222 Message-Id: <20101207233832.E3EF5846933@dhcp-adc-twvpn-2-vpnpool-10-154-62-147.vpn.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit #At file:///Users/kevinlewis/Work/Mysql/55222.push/mysql-trunk-innodb/ based on revid:jimmy.yang@stripped 3368 kevin.lewis@stripped 2010-12-07 [merge] Merge Bug#55222 bugfix to mysql-trunk-innodb modified: storage/innobase/dict/dict0load.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 @@ -470,6 +470,8 @@ dict_process_sys_foreign_rec( err_len: return("incorrect column length in SYS_FOREIGN"); } + + foreign->heap = heap; foreign->id = mem_heap_strdupl(heap, (const char*) field, len); rec_get_nth_field_offs_old(rec, 1/*DB_TRX_ID*/, &len); No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).