1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

InnoDB 5.6.47 and XtraDB 5.6.46-86.2

Browse Source 
The only change is a change of the version number.
In MySQL 5.6.46, the copyright comments in a number of files were changed
in mysql/mysql-server@f1a006ece7
but there was no functional change to InnoDB code.
This was also reflected by XtraDB. We are not changing the copyright
comments in MariaDB Server for now.

Between MySQL 5.6.46 and 5.6.47, InnoDB was not changed at all.

Actually, we had forgotten to update the InnoDB version number to
5.6.46. With this change, we are updating InnoDB
from 5.6.45 to 5.6.47 and XtraDB from 5.6.45-86.1 to 5.6.46-86.2.
This commit is contained in:
Marko Mäkelä 2020-01-17 17:39:20 +02:00
parent bde7e0ba6e
commit 02af6278fb
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff
View File

@ -1214,8 +1214,8 @@
COMMAND_LINE_ARGUMENT OPTIONAL
VARIABLE_NAME INNODB_VERSION
SESSION_VALUE NULL
-GLOBAL_VALUE 5.6.45
+GLOBAL_VALUE 5.6.45-86.1
-GLOBAL_VALUE 5.6.47
+GLOBAL_VALUE 5.6.46-86.2
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE NULL
VARIABLE_SCOPE GLOBAL

4
mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff
View File

@ -684,8 +684,8 @@
COMMAND_LINE_ARGUMENT OPTIONAL
VARIABLE_NAME INNODB_VERSION
SESSION_VALUE NULL
-GLOBAL_VALUE 5.6.45
+GLOBAL_VALUE 5.6.45-86.1
-GLOBAL_VALUE 5.6.47
+GLOBAL_VALUE 5.6.46-86.2
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE NULL
VARIABLE_SCOPE GLOBAL

2
mysql-test/suite/sys_vars/r/sysvars_innodb.result
View File

@ -2401,7 +2401,7 @@ READ_ONLY NO
COMMAND_LINE_ARGUMENT OPTIONAL
VARIABLE_NAME INNODB_VERSION
SESSION_VALUE NULL
GLOBAL_VALUE 5.6.45
GLOBAL_VALUE 5.6.47
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE NULL
VARIABLE_SCOPE GLOBAL

2
storage/innobase/include/univ.i
View File

@ -45,7 +45,7 @@ Created 1/20/1994 Heikki Tuuri
#define INNODB_VERSION_MAJOR 5
#define INNODB_VERSION_MINOR 6
#define INNODB_VERSION_BUGFIX 45
#define INNODB_VERSION_BUGFIX 47
/* The following is the InnoDB version as shown in
SELECT plugin_version FROM information_schema.plugins;

4
storage/xtradb/include/univ.i
View File

@ -45,10 +45,10 @@ Created 1/20/1994 Heikki Tuuri
#define INNODB_VERSION_MAJOR 5
#define INNODB_VERSION_MINOR 6
#define INNODB_VERSION_BUGFIX 45
#define INNODB_VERSION_BUGFIX 46
#ifndef PERCONA_INNODB_VERSION
#define PERCONA_INNODB_VERSION 86.1
#define PERCONA_INNODB_VERSION 86.2
#endif
/* Enable UNIV_LOG_ARCHIVE in XtraDB */