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

Merge branch '10.1' into 10.2

This commit is contained in:
Sergei Golubchik
2017-07-05 19:08:55 +02:00
99 changed files with 2787 additions and 408 deletions

View File

@ -4499,16 +4499,7 @@ void TABLE::init(THD *thd, TABLE_LIST *tl)
DBUG_ASSERT(!file->keyread_enabled());
/* mark the record[0] uninitialized */
TRASH_ALLOC(record[0], s->reclength);
/*
Initialize the null marker bits, to ensure that if we are doing a read
of only selected columns (like in keyread), all null markers are
initialized.
*/
memset(record[0], 255, s->null_bytes);
memset(record[1], 255, s->null_bytes);
restore_record(this, s->default_values);
/* Tables may be reused in a sub statement. */
DBUG_ASSERT(!file->extra(HA_EXTRA_IS_ATTACHED_CHILDREN));