mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-06 07:05:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '10.2' into 10.3

Browse source
This commit is contained in:
Oleksandr Byelkin 2022-05-03 10:59:54 +02:00
commit 9614fde1aa
111 changed files with 2663 additions and 552 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sql/sql_handler.cc
View file

@ -701,8 +701,10 @@ mysql_ha_fix_cond_and_key(SQL_HANDLER *handler,
if (!in_prepare)
{
MY_BITMAP *old_map= dbug_tmp_use_all_columns(table, &table->write_set);
(void) item->save_in_field(key_part->field, 1);
int res= item->save_in_field(key_part->field, 1);
dbug_tmp_restore_column_map(&table->write_set, old_map);
if (res)
return 1;
}
key_len+= key_part->store_length;
keypart_map= (keypart_map << 1) | 1;