From: Tatiana A. Nurnberg Date: March 11 2009 6:10pm Subject: bzr commit into mysql-5.1-bugteam branch (azundris:2813) Bug#36751 List-Archive: http://lists.mysql.com/commits/68943 X-Bug: 36751 Message-Id: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7879871400091833063==" --===============7879871400091833063== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///misc/mysql/forest/36751/51-36751/ based on revid:alfranio.correia@stripped 2813 Tatiana A. Nurnberg 2009-03-11 Bug#36751: Segmentation fault in ctype-bin.c:308; Linux 86_64, with-max-indexes=128 mysqld is optimized for the default case (up to 64-indices); for a greater number of indices it goes through a different code path. As that code-path is a compile-time option and can not easily be covered in standard tests, bitrot occurred. key-fields need an explicit initialization in the non- optimized case; this setup was presumably not added when a new key- vector was added. Changeset adds the necessary initialisations. No test case added due to dependence on compile-time option. @ sql/sql_select.cc Init merge_keys as well. If we don't, things blow up badly outside of the optimized-for-64-keys case! @ sql/table.cc Init merge_keys as well. If we don't, things blow up badly outside of the optimized-for-64-keys case! modified: sql/sql_select.cc sql/table.cc === modified file 'sql/sql_select.cc' --- a/sql/sql_select.cc 2009-02-19 18:30:05 +0000 +++ b/sql/sql_select.cc 2009-03-11 18:09:56 +0000 @@ -9788,6 +9788,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARA table->in_use= thd; table->quick_keys.init(); table->covering_keys.init(); + table->merge_keys.init(); table->keys_in_use_for_query.init(); table->s= share; === modified file 'sql/table.cc' --- a/sql/table.cc 2009-01-05 16:10:20 +0000 +++ b/sql/table.cc 2009-03-11 18:09:56 +0000 @@ -1652,6 +1652,7 @@ int open_table_from_share(THD *thd, TABL goto err; outparam->quick_keys.init(); outparam->covering_keys.init(); + outparam->merge_keys.init(); outparam->keys_in_use_for_query.init(); /* Allocate handler */ --===============7879871400091833063== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/azundris@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: azundris@stripped # target_branch: file:///misc/mysql/forest/36751/51-36751/ # testament_sha1: efbbb0368f358cff168b58893c0d2a21d71b8141 # timestamp: 2009-03-11 19:10:06 +0100 # base_revision_id: alfranio.correia@stripped\ # l1a5euyy8d9sm8rk # # Begin bundle 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 +LVZxQTVihyX/xdyRThQkNHAMAY= --===============7879871400091833063==--