database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-10-12 12:25:37 +03:00
Code Activity

MDEV-18889 Long unique on virtual fields crashes server

Browse Source 
Use table->record[0] for ha_index_read_map so that vfield gets automatically
be updated.
This commit is contained in:
sachinsetia1001@gmail.com
2019-03-16 12:34:08 +05:30
parent 09b2d37a32
commit 8995f33c0b
3 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/handler.cc
View File

@@ -6547,7 +6547,8 @@ static int check_duplicate_long_entry_key(TABLE *table, handler *h,
result= h->ha_index_init(key_no, 0);
if (result)
return result;
result= h->ha_index_read_map(table->check_unique_buf,
store_record(table, check_unique_buf);
result= h->ha_index_read_map(table->record[0],
ptr, HA_WHOLE_KEY, HA_READ_KEY_EXACT);
if (!result)
{
@@ -6583,7 +6584,7 @@ static int check_duplicate_long_entry_key(TABLE *table, handler *h,
}
}
}
while (!is_same && !(result= h->ha_index_next_same(table->check_unique_buf,
while (!is_same && !(result= h->ha_index_next_same(table->record[0],
ptr, key_info->key_length)));
if (is_same)
error= HA_ERR_FOUND_DUPP_KEY;
@@ -6597,10 +6598,11 @@ exit:
table->file->errkey= key_no;
if (h->ha_table_flags() & HA_DUPLICATE_POS)
{
h->position(table->check_unique_buf);
h->position(table->record[0]);
memcpy(table->file->dup_ref, h->ref, h->ref_length);
}
}
restore_record(table, check_unique_buf);
h->ha_index_end();
return error;
}