Commit ad726fb9 authored by Alexey Kopytov's avatar Alexey Kopytov

Automerge.

parents 30d365ec f060a5fc
...@@ -9797,6 +9797,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields, ...@@ -9797,6 +9797,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields,
table->in_use= thd; table->in_use= thd;
table->quick_keys.init(); table->quick_keys.init();
table->covering_keys.init(); table->covering_keys.init();
table->merge_keys.init();
table->keys_in_use_for_query.init(); table->keys_in_use_for_query.init();
table->s= share; table->s= share;
......
...@@ -1652,6 +1652,7 @@ int open_table_from_share(THD *thd, TABLE_SHARE *share, const char *alias, ...@@ -1652,6 +1652,7 @@ int open_table_from_share(THD *thd, TABLE_SHARE *share, const char *alias,
goto err; goto err;
outparam->quick_keys.init(); outparam->quick_keys.init();
outparam->covering_keys.init(); outparam->covering_keys.init();
outparam->merge_keys.init();
outparam->keys_in_use_for_query.init(); outparam->keys_in_use_for_query.init();
/* Allocate handler */ /* Allocate handler */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment