mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 11:57:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

MDEV-20949: Merge 10.3 into 10.4

Browse source
This commit is contained in:
Marko Mäkelä 2019-11-14 13:22:29 +02:00
commit 746ee78535
20 changed files with 759 additions and 311 deletions
Download patch file Download diff file Expand all files Collapse all files

3
storage/innobase/include/page0zip.ic
View file

@ -154,6 +154,9 @@ tablespace is not compressed
inline bool page_zip_rec_needs_ext(ulint rec_size, ulint comp, ulint n_fields,
ulint zip_size)
{
/* FIXME: row size check is this function seems to be the most correct.
Put it in a separate function and use in more places of InnoDB */
ut_ad(rec_size
> ulint(comp ? REC_N_NEW_EXTRA_BYTES : REC_N_OLD_EXTRA_BYTES));
ut_ad(comp || !zip_size);