database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch '10.5' into 10.6

Browse Source
This commit is contained in:
Sergei Golubchik
2024-05-08 20:06:00 +02:00
parent 30d3cfad69 29c185bd77
commit 7b53672c63
360 changed files with 9013 additions and 2214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
sql/sql_insert.cc
View File

@ -1888,14 +1888,31 @@ int write_record(THD *thd, TABLE *table, COPY_INFO *info, select_result *sink)
was used. This ensures that we don't get a problem when the
whole range of the key has been used.
*/
if (info->handle_duplicates == DUP_REPLACE && table->next_number_field &&
if (info->handle_duplicates == DUP_REPLACE &&
key_nr == table->s->next_number_index && insert_id_for_cur_row > 0)
goto err;
if (table->file->ha_table_flags() & HA_DUPLICATE_POS)
if (table->file->has_dup_ref())
{
/*
If engine doesn't support HA_DUPLICATE_POS, the handler may init to
INDEX, but dup_ref could also be set by lookup_handled (and then,
lookup_errkey is set, f.ex. long unique duplicate).
In such case, handler would stay uninitialized, so do it here.
*/
bool init_lookup_handler= table->file->lookup_errkey != (uint)-1 &&
table->file->inited == handler::NONE;
if (init_lookup_handler && table->file->ha_rnd_init_with_error(false))
goto err;
DBUG_ASSERT(table->file->inited == handler::RND);
if (table->file->ha_rnd_pos(table->record[1],table->file->dup_ref))
goto err;
int rnd_pos_err= table->file->ha_rnd_pos(table->record[1],
table->file->dup_ref);
if (init_lookup_handler)
table->file->ha_rnd_end();
if (rnd_pos_err)
goto err;
}
else
{