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 10.11 into 11.0

Browse Source
This commit is contained in:
Marko Mäkelä
2024-03-28 10:51:36 +02:00
parent 62243c444f a79fb66a98
commit fec2fd6add
490 changed files with 14843 additions and 4704 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_update.cc
View File

@ -257,7 +257,7 @@ static void prepare_record_for_error_message(int error, TABLE *table)
Field *field;
uint keynr;
MY_BITMAP unique_map; /* Fields in offended unique. */
my_bitmap_map unique_map_buf[bitmap_buffer_size(MAX_FIELDS)];
my_bitmap_map unique_map_buf[bitmap_buffer_size(MAX_FIELDS)/sizeof(my_bitmap_map)];
DBUG_ENTER("prepare_record_for_error_message");
/*