database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.1 into 10.2

Browse Source
This commit is contained in:
Marko Mäkelä
2019-07-23 16:34:04 +03:00
parent 3bcda8ad5f 1f498f901b
commit 058c385e03
7 changed files with 12 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1214,8 +1214,8 @@
COMMAND_LINE_ARGUMENT OPTIONAL
VARIABLE_NAME INNODB_VERSION
SESSION_VALUE NULL
-GLOBAL_VALUE 5.6.44
+GLOBAL_VALUE 5.6.43-84.3
-GLOBAL_VALUE 5.6.45
+GLOBAL_VALUE 5.6.44-86.0
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE NULL
VARIABLE_SCOPE GLOBAL

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

@@ -684,8 +684,8 @@
COMMAND_LINE_ARGUMENT OPTIONAL
VARIABLE_NAME INNODB_VERSION
SESSION_VALUE NULL
-GLOBAL_VALUE 5.6.44
+GLOBAL_VALUE 5.6.43-84.3
-GLOBAL_VALUE 5.6.45
+GLOBAL_VALUE 5.6.44-86.0
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE NULL
VARIABLE_SCOPE GLOBAL