diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-26 23:40:11 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-26 23:40:11 +0200 |
| commit | f1f8ebc325d2b91991ee0de8488f482dc81bbf27 (patch) | |
| tree | efea0f337e3344e9401f95dd851ec807bbe93ffc /sql/opt_subselect.cc | |
| parent | 6fbfb4c83c01fef445185b473d4dc1e0cc78db0a (diff) | |
| parent | afb461587c0b7dea2e5e70a165e8d4d437c3f964 (diff) | |
| download | mariadb-git-f1f8ebc325d2b91991ee0de8488f482dc81bbf27.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'sql/opt_subselect.cc')
| -rw-r--r-- | sql/opt_subselect.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc index 361da4e6279..ce833ea13da 100644 --- a/sql/opt_subselect.cc +++ b/sql/opt_subselect.cc @@ -4059,13 +4059,13 @@ SJ_TMP_TABLE::create_sj_weedout_tmp_table(THD *thd) share->db_plugin= ha_lock_engine(0, TMP_ENGINE_HTON); table->file= get_new_handler(share, &table->mem_root, share->db_type()); - DBUG_ASSERT(uniq_tuple_length_arg <= table->file->max_key_length()); } else { share->db_plugin= ha_lock_engine(0, heap_hton); table->file= get_new_handler(share, &table->mem_root, share->db_type()); + DBUG_ASSERT(uniq_tuple_length_arg <= table->file->max_key_length()); } if (!table->file) goto err; |