MDEV-11108: Assertion `uniq_tuple_length_arg <= table->file->max_key_length()' failed in SJ_TMP_TABLE::create_sj_weedout_tmp_table

varunraiko · varunraiko · commit 8725b35d897c · 2017-01-24T01:25:50.000+05:30
Removed the assert from the if clause to the else clause.
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -4044,13 +4044,13 @@ SJ_TMP_TABLE::create_sj_weedout_tmp_table(THD *thd)`
`4044`	`4044`	`share->db_plugin= ha_lock_engine(0, TMP_ENGINE_HTON);`
`4045`	`4045`	`table->file= get_new_handler(share, &table->mem_root,`
`4046`	`4046`	`share->db_type());`
`4047`		`- DBUG_ASSERT(uniq_tuple_length_arg <= table->file->max_key_length());`
`4048`	`4047`	`}`
`4049`	`4048`	`else`
`4050`	`4049`	`{`
`4051`	`4050`	`share->db_plugin= ha_lock_engine(0, heap_hton);`
`4052`	`4051`	`table->file= get_new_handler(share, &table->mem_root,`
`4053`	`4052`	`share->db_type());`
	`4053`	`+ DBUG_ASSERT(uniq_tuple_length_arg <= table->file->max_key_length());`
`4054`	`4054`	`}`
`4055`	`4055`	`if (!table->file)`
`4056`	`4056`	`goto err;`