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.1 to 10.2.

Browse Source 
Most notably, this includes MDEV-11623, which includes a fix and
an upgrade procedure for the InnoDB file format incompatibility
that is present in MariaDB Server 10.1.0 through 10.1.20.

In other words, this merge should address
MDEV-11202 InnoDB 10.1 -> 10.2 migration does not work
This commit is contained in:
Marko Mäkelä
2017-01-19 12:06:13 +02:00
parent 833aa97cec 0349712937
commit b05bf8ff0f
81 changed files with 2131 additions and 2201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_trigger.cc
View File

@ -1206,7 +1206,7 @@ bool Table_triggers_list::prepare_record_accessors(TABLE *table)
(table->s->stored_fields != table->s->null_fields))
{
int null_bytes= (table->s->stored_fields - table->s->null_fields + 7)/8;
int null_bytes= (table->s->fields - table->s->null_fields + 7)/8;
if (!(extra_null_bitmap= (uchar*)alloc_root(&table->mem_root, null_bytes)))
return 1;
if (!(record0_field= (Field **)alloc_root(&table->mem_root,