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

Merge branch '10.8' into 10.9

Browse Source
This commit is contained in:
Sergei Golubchik
2022-05-18 15:04:50 +02:00
parent 5dba54bfef b7ffccf49b
commit bf2bdd1a1a
365 changed files with 10200 additions and 2464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/handler.cc
View File

@ -4365,6 +4365,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;
}
}
@ -5810,6 +5811,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_behavior & OLD_MODE_COMPAT_5_1_CHECKSUM) &&
f->is_real_null(0))