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

Merge branch '10.5' into 10.6

Browse Source
This commit is contained in:
Sergei Golubchik
2022-05-10 11:53:59 +02:00
parent f4d671bff2 fe3d07cab8
commit 3bc98a4ec4
249 changed files with 7080 additions and 1864 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/handler.cc
View File

@ -4364,6 +4364,7 @@ void handler::print_error(int error, myf errflag)
if ((int) key_nr >= 0 && key_nr < table->s->keys)
{
print_keydup_error(table, &table->key_info[key_nr], errflag);
table->file->lookup_errkey= -1;
DBUG_VOID_RETURN;
}
}
@ -5809,6 +5810,9 @@ int handler::calculate_checksum()
for (uint i= 0; i < table->s->fields; i++ )
{
Field *f= table->field[i];
if (!f->stored_in_db())
continue;
if (! thd->variables.old_mode && f->is_real_null(0))
{