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

5.6.43-84.3

Browse Source
This commit is contained in:
Marko Mäkelä 2019-04-25 10:43:55 +03:00
commit ecea90871e
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1215,7 +1215,7 @@
VARIABLE_NAME INNODB_VERSION VARIABLE_NAME INNODB_VERSION
SESSION_VALUE NULL SESSION_VALUE NULL
-GLOBAL_VALUE 5.6.43 -GLOBAL_VALUE 5.6.43
+GLOBAL_VALUE 5.6.42-84.2 +GLOBAL_VALUE 5.6.43-84.3
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE NULL DEFAULT_VALUE NULL
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL

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

@ -685,7 +685,7 @@
VARIABLE_NAME INNODB_VERSION VARIABLE_NAME INNODB_VERSION
SESSION_VALUE NULL SESSION_VALUE NULL
-GLOBAL_VALUE 5.6.43 -GLOBAL_VALUE 5.6.43
+GLOBAL_VALUE 5.6.42-84.2 +GLOBAL_VALUE 5.6.43-84.3
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE NULL DEFAULT_VALUE NULL
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL

4
storage/xtradb/handler/ha_innodb.cc
View File

@ -19148,8 +19148,10 @@ innodb_track_changed_pages_validate(
return 0; return 0;
} }
if (intbuf == srv_track_changed_pages) if (intbuf == srv_track_changed_pages) { // == 0
*reinterpret_cast<ulong*>(save) = srv_track_changed_pages;
return 0; return 0;
}
return 1; return 1;
} }

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_MAJOR 5
#define INNODB_VERSION_MINOR 6 #define INNODB_VERSION_MINOR 6
#define INNODB_VERSION_BUGFIX 42 #define INNODB_VERSION_BUGFIX 43
#ifndef PERCONA_INNODB_VERSION #ifndef PERCONA_INNODB_VERSION
#define PERCONA_INNODB_VERSION 84.2 #define PERCONA_INNODB_VERSION 84.3
#endif #endif
/* Enable UNIV_LOG_ARCHIVE in XtraDB */ /* Enable UNIV_LOG_ARCHIVE in XtraDB */