diff options
author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2016-02-10 03:49:11 +0200 |
---|---|---|
committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2016-02-10 04:00:08 +0200 |
commit | 3c5c04bd2bccbfeb62a86bdc5610b1dcea378dd3 (patch) | |
tree | 184f3fbd9a0302c8da3d4b0dda0a0ce55edc8f83 /sql/sql_select.cc | |
parent | 6b614c620ec32cd8d96be880bbc8ff7c45bac7ce (diff) | |
download | mariadb-git-3c5c04bd2bccbfeb62a86bdc5610b1dcea378dd3.tar.gz |
MDEV-7122: Assertion `0' failed in subselect_hash_sj_engine::init
Fix test failure when using maria small-block size. We need to query
the max_key_length and max_key_parts based on the the tmp table engine.
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r-- | sql/sql_select.cc | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 061e367d725..b1e22537b37 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -15307,13 +15307,6 @@ create_tmp_table(THD *thd, TMP_TABLE_PARAM *param, List<Item> &fields, if (!table->file) goto err; - /* - Temporary table storage engines must allow keys of at least - HA_MAX_KEY_LENGT and at least HA_MAX_KEY_SEG key parts. - */ - DBUG_ASSERT(table->file->max_key_length() >= HA_MAX_KEY_LENGTH && - table->file->max_key_parts() >= HA_MAX_KEY_SEG); - if (!using_unique_constraint) reclength+= group_null_items; // null flag is stored separately @@ -16305,12 +16298,6 @@ create_internal_tmp_table_from_heap2(THD *thd, TABLE *table, if (!(new_table.file= get_new_handler(&share, &new_table.mem_root, new_table.s->db_type()))) DBUG_RETURN(1); // End of memory - /* - Temporary table storage engines must allow keys of at least - HA_MAX_KEY_LENGTH and at least HA_MAX_KEY_SEG key parts. - */ - DBUG_ASSERT(new_table.file->max_key_length() >= HA_MAX_KEY_LENGTH && - new_table.file->max_key_parts() >= HA_MAX_KEY_SEG); save_proc_info=thd->proc_info; thd_proc_info(thd, proc_info); |