mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
misc after-merge changes:
* remove new InnoDB-specific ER_ and HA_ERR_ codes * renamed few old ER_ and HA_ERR_ error messages to be less MyISAM-specific * remove duplicate enum definitions (durability_properties, icp_result) * move new mysql-test include files to their owner suite * rename xtradb.rdiff files to *-disabled * remove mistakenly committed helper perl module * remove long obsolete handler::ha_statistic_increment() method * restore the standard C xid_t structure to not have setters and getters * remove xid_t::reset that was cleaning too much * move MySQL-5.7 ER_ codes where they belong * fir innodb to include service_wsrep.h not internal wsrep headers * update tests and results
This commit is contained in:
4
mysql-test/suite/innodb_zip/include/have_innodb_zip.inc
Normal file
4
mysql-test/suite/innodb_zip/include/have_innodb_zip.inc
Normal file
@ -0,0 +1,4 @@
|
||||
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.
|
||||
}
|
@ -0,0 +1,4 @@
|
||||
if (`select count(*) = 0 from information_schema.global_variables where variable_name like 'innodb_undo_tablespaces' and variable_value = 0`)
|
||||
{
|
||||
--skip Test requires innodb_undo_tablespaces=0
|
||||
}
|
Reference in New Issue
Block a user