mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-07 15:45:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '10.2' into 10.3

Browse source
This commit is contained in:
Sergei Golubchik 2018-06-30 16:39:20 +02:00
commit 36e59752e7
273 changed files with 4469 additions and 1286 deletions
Download patch file Download diff file Expand all files Collapse all files

2
storage/innobase/include/fsp0fsp.h
View file

@ -686,7 +686,7 @@ fsp_flags_convert_from_101(ulint flags)
/* Bits 13..16 are the wrong position for PAGE_SSIZE, and they
should contain one of the values 3,4,6,7, that is, be of the form
0b0011 or 0b01xx (except 0b0110).
0b0011 or 0b01xx (except 0b0101).
In correct versions, these bits should be 0bc0se
where c is the MariaDB COMPRESSED flag
and e is the MySQL 5.7 ENCRYPTION flag