summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVarun Gupta <varunraiko1803@gmail.com>2017-01-24 01:25:50 +0530
committerVarun Gupta <varunraiko1803@gmail.com>2017-01-24 01:25:50 +0530
commit8725b35d897cfad6e55217ae80e7c387e8dfe8da (patch)
treec769af435f1442692242c67962c424cf7e2bb98b
parent18ef02b04dfae21148c7397d088c7ffdfcd23c4e (diff)
downloadmariadb-git-8725b35d897cfad6e55217ae80e7c387e8dfe8da.tar.gz
MDEV-11108: Assertion `uniq_tuple_length_arg <= table->file->max_key_length()' failed in SJ_TMP_TABLE::create_sj_weedout_tmp_table
Removed the assert from the if clause to the else clause.
-rw-r--r--sql/opt_subselect.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc
index a81b091461f..564a108c766 100644
--- a/sql/opt_subselect.cc
+++ b/sql/opt_subselect.cc
@@ -4044,13 +4044,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;