1
0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00

Merge 10.1 into 10.2

Replace have_innodb_zip.inc with innodb_page_size_small.inc.
This commit is contained in:
Marko Mäkelä
2017-06-08 12:45:08 +03:00
115 changed files with 2679 additions and 915 deletions

View File

@@ -1,4 +0,0 @@
if (`SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE LOWER(variable_name) = 'innodb_page_size' AND variable_value <= 16384`)
{
--skip Test with InnoDB zip requires page size not greater than 16k.
}