database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge 10.11 into 11.4

Browse Source
This commit is contained in:
Marko Mäkelä
2025-01-09 07:58:08 +02:00
parent 437550b7cf 28b2958082
commit 17f01186f5
473 changed files with 4731 additions and 3149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_handler.cc
View File

@@ -713,7 +713,7 @@ mysql_ha_fix_cond_and_key(SQL_HANDLER *handler,
MY_BITMAP *old_map= dbug_tmp_use_all_columns(table, &table->write_set);
int res= item->save_in_field(key_part->field, 1);
dbug_tmp_restore_column_map(&table->write_set, old_map);
if (res)
if (res < 0 || thd->is_error())
return 1;
}
key_len+= key_part->store_length;