diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-05-15 08:57:21 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-05-15 23:01:18 +0300 |
| commit | 442a6e6b257e335f70730b0e18394c2f638f2962 (patch) | |
| tree | 76d8419978c4f6c78e18338c1ce26d312770d1b7 /mysql-test | |
| parent | 27f12c5d5b0b1596bb7918f06932ae566011c754 (diff) | |
| download | mariadb-git-442a6e6b257e335f70730b0e18394c2f638f2962.tar.gz | |
MDEV-16172 Remove InnoDB 5.7 version number from MariaDB 10.3 onwards
Because the InnoDB implementation in MariaDB has diverged from MySQL,
it is not meaningful to report a MySQL version number for InnoDB
any more. Some examples include:
MariaDB 10.1 (which is based on MySQL 5.6) included encryption and
variable-size page compression before MySQL 5.7 introduced them.
MariaDB 10.2 (based on MySQL 5.7) introduced persistent AUTO_INCREMENT
(MDEV-6076) in a GA release before MySQL 8.0.
MariaDB 10.3 (based on MySQL 5.7) introduced instant ADD COLUMN
(MDEV-11369) before MySQL.
All of these features use a different implementation and file format.
Also, some features were never merged from MySQL 5.7, and thus MariaDB
is not affected by related bugs. Examples include CREATE TABLESPACE
and the reimplementation of the partitioning engine.
Diffstat (limited to 'mysql-test')
3 files changed, 1 insertions, 11 deletions
diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb.result b/mysql-test/suite/sys_vars/r/sysvars_innodb.result index 74152628562..76894419632 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_innodb.result +++ b/mysql-test/suite/sys_vars/r/sysvars_innodb.result @@ -2403,7 +2403,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT NONE VARIABLE_NAME INNODB_VERSION SESSION_VALUE NULL -GLOBAL_VALUE 5.7.21 +GLOBAL_VALUE 10.3.7 GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE NULL VARIABLE_SCOPE GLOBAL diff --git a/mysql-test/suite/sys_vars/t/innodb_stats_include_delete_marked_basic.test b/mysql-test/suite/sys_vars/t/innodb_stats_include_delete_marked_basic.test index a3a9b99a133..2a3a0f9b44e 100644 --- a/mysql-test/suite/sys_vars/t/innodb_stats_include_delete_marked_basic.test +++ b/mysql-test/suite/sys_vars/t/innodb_stats_include_delete_marked_basic.test @@ -18,11 +18,6 @@ --source include/have_innodb.inc -if (`select plugin_auth_version <= "5.7.17" from information_schema.plugins where plugin_name='innodb'`) -{ - --skip Not present before MySQL 5.7.17 or 5.6.35 -} - #################################################################### # Display default value # #################################################################### diff --git a/mysql-test/suite/sys_vars/t/sysvars_innodb.test b/mysql-test/suite/sys_vars/t/sysvars_innodb.test index fe91835eac5..5c18ab2a9a0 100644 --- a/mysql-test/suite/sys_vars/t/sysvars_innodb.test +++ b/mysql-test/suite/sys_vars/t/sysvars_innodb.test @@ -3,11 +3,6 @@ --source include/not_valgrind.inc --source include/word_size.inc -if (`select plugin_auth_version <= "5.6.34-79.1" from information_schema.plugins where plugin_name='innodb'`) -{ - --skip Not fixed in XtraDB as of 10.1.21-MariaDB or earlier -} - --vertical_results --replace_regex /^\/\S+/PATH/ /\.\//PATH/ select * from information_schema.system_variables |