diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-08-09 22:29:02 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-08-10 08:55:14 +0300 |
| commit | bdab49d389821724659847a944c6f403deddd430 (patch) | |
| tree | c559bd1f45e7eec52ccad0f2e2e341ed02e8fb20 /mysql-test/suite/sys_vars | |
| parent | 067ee84d67247209f83805366f59791a9ac074b2 (diff) | |
| parent | 38be0beb5da1ee72697242504a5e21766063bc41 (diff) | |
| download | mariadb-git-bdab49d389821724659847a944c6f403deddd430.tar.gz | |
MDEV-13481 Merge new release of InnoDB MySQL 5.7.19 to 10.2
Only a relevant subset of the InnoDB changes was merged.
In particular, two follow-up bug fixes for the bugs that
were introduced in 5.7.18 but not MariaDB 10.2.7 were omitted.
Because MariaDB 10.2.7 omitted the risky change
Bug#23481444 OPTIMISER CALL ROW_SEARCH_MVCC() AND READ THE INDEX
APPLIED BY UNCOMMITTED ROWS
we do not need the follow-up fixes that were introduced in
MySQL 5.6.37 and MySQL 5.7.19:
Bug#25175249 ASSERTION: (TEMPL->IS_VIRTUAL && !FIELD) || ...
Bug#25793677 INNODB: FAILING ASSERTION: CLUST_TEMPL_FOR_SEC || LEN
Diffstat (limited to 'mysql-test/suite/sys_vars')
| -rw-r--r-- | mysql-test/suite/sys_vars/r/sysvars_innodb.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb.result b/mysql-test/suite/sys_vars/r/sysvars_innodb.result index 7402b84dc96..62a72525aab 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_innodb.result +++ b/mysql-test/suite/sys_vars/r/sysvars_innodb.result @@ -3074,7 +3074,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME INNODB_VERSION SESSION_VALUE NULL -GLOBAL_VALUE 5.7.18 +GLOBAL_VALUE 5.7.19 GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE NULL VARIABLE_SCOPE GLOBAL |