1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-19365 Assertion failure in LONG Unique after 10.3 merge

Browse Source 
If handler->inited is RND use cloned handler for long unique duplicate search.
This commit is contained in:
Sachin 2019-05-05 12:24:54 +05:30 committed by Marko Mäkelä
parent d18ef804bb
commit 27980b0f83
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sql/handler.cc
View File

@ -6500,8 +6500,7 @@ static int check_duplicate_long_entries_update(TABLE *table, handler *h, uchar *
with respect to fields in hash_str with respect to fields in hash_str
*/ */
uint reclength= (uint) (table->record[1] - table->record[0]); uint reclength= (uint) (table->record[1] - table->record[0]);
if (!table->update_handler) table->clone_handler_for_update();
table->clone_handler_for_update();
for (uint i= 0; i < table->s->keys; i++) for (uint i= 0; i < table->s->keys; i++)
{ {
keyinfo= table->key_info + i; keyinfo= table->key_info + i;
@ -6546,6 +6545,8 @@ int handler::ha_write_row(uchar *buf)
if (table->s->long_unique_table) if (table->s->long_unique_table)
{ {
if (this->inited == RND)
table->clone_handler_for_update();
handler *h= table->update_handler ? table->update_handler : table->file; handler *h= table->update_handler ? table->update_handler : table->file;
if ((error= check_duplicate_long_entries(table, h, buf))) if ((error= check_duplicate_long_entries(table, h, buf)))
DBUG_RETURN(error); DBUG_RETURN(error);

2
sql/table.cc
View File

@ -9014,6 +9014,8 @@ void re_setup_keyinfo_hash(KEY *key_info)
*/ */
void TABLE::clone_handler_for_update() void TABLE::clone_handler_for_update()
{ {
if (this->update_handler)
return;
handler *update_handler= NULL; handler *update_handler= NULL;
if (!s->long_unique_table) if (!s->long_unique_table)
return; return;