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

XtraDB 5.6.45-86.1

Browse Source
This commit is contained in:
Marko Mäkelä 2019-10-30 11:56:05 +02:00
parent d1e6b0bcff
commit d03a59c6ff
11 changed files with 21 additions and 19 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.45 -GLOBAL_VALUE 5.6.45
+GLOBAL_VALUE 5.6.44-86.0 +GLOBAL_VALUE 5.6.45-86.1
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.45 -GLOBAL_VALUE 5.6.45
+GLOBAL_VALUE 5.6.44-86.0 +GLOBAL_VALUE 5.6.45-86.1
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE NULL DEFAULT_VALUE NULL
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL

3
storage/xtradb/buf/buf0buf.cc
View File

@ -124,7 +124,8 @@ _increment_page_get_statistics(buf_block_t* block, trx_t* trx)
byte block_hash_offset; byte block_hash_offset;
ut_ad(block); ut_ad(block);
ut_ad(trx && trx->take_stats); ut_ad(trx);
ut_ad(trx->take_stats);
if (!trx->distinct_page_access_hash) { if (!trx->distinct_page_access_hash) {
trx->distinct_page_access_hash trx->distinct_page_access_hash

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

@ -2136,12 +2136,13 @@ UNIV_INTERN
ulong ulong
thd_flush_log_at_trx_commit( thd_flush_log_at_trx_commit(
/*================================*/ /*================================*/
void* thd) THD* thd)
{ {
/* THDVAR cannot be used in xtrabackup, /* THDVAR cannot be used in xtrabackup,
plugin variables for innodb are not loaded, plugin variables for innodb are not loaded,
this makes xtrabackup crash when trying to use them. */ this makes xtrabackup crash when trying to use them. */
return (thd || !IS_XTRABACKUP())? THDVAR((THD*)thd, flush_log_at_trx_commit) : FALSE; return (thd || !IS_XTRABACKUP())
? THDVAR(thd, flush_log_at_trx_commit) : 0;
} }
/********************************************************************//** /********************************************************************//**
@ -21134,14 +21135,14 @@ static MYSQL_SYSVAR_BOOL(force_primary_key,
"Do not allow to create table without primary key (off by default)", "Do not allow to create table without primary key (off by default)",
NULL, NULL, FALSE); NULL, NULL, FALSE);
const char *corrupt_table_action_names[]= static const char *corrupt_table_action_names[]=
{ {
"assert", /* 0 */ "assert", /* 0 */
"warn", /* 1 */ "warn", /* 1 */
"salvage", /* 2 */ "salvage", /* 2 */
NullS NullS
}; };
TYPELIB corrupt_table_action_typelib= static TYPELIB corrupt_table_action_typelib=
{ {
array_elements(corrupt_table_action_names) - 1, "corrupt_table_action_typelib", array_elements(corrupt_table_action_names) - 1, "corrupt_table_action_typelib",
corrupt_table_action_names, NULL corrupt_table_action_names, NULL

4
storage/xtradb/include/btr0sea.ic
View File

@ -104,8 +104,8 @@ btr_search_get_latch(
/*=================*/ /*=================*/
const dict_index_t* index) /*!< in: index */ const dict_index_t* index) /*!< in: index */
{ {
ut_ad(index->search_latch >= btr_search_latch_arr && ut_ad(index->search_latch >= btr_search_latch_arr);
index->search_latch < btr_search_latch_arr + ut_ad(index->search_latch < btr_search_latch_arr +
btr_search_index_num); btr_search_index_num);
return(index->search_latch); return(index->search_latch);

2
storage/xtradb/include/ha_prototypes.h
View File

@ -418,7 +418,7 @@ innobase_get_table_cache_size(void);
ulong ulong
thd_flush_log_at_trx_commit( thd_flush_log_at_trx_commit(
/*================================*/ /*================================*/
void* thd); THD* thd);
/**********************************************************************//** /**********************************************************************//**
Get the current setting of the lower_case_table_names global parameter from Get the current setting of the lower_case_table_names global parameter from

3
storage/xtradb/include/sync0rw.ic
View File

@ -453,7 +453,8 @@ rw_lock_higher_prio_waiters_exist(
return(false); return(false);
} }
ut_ad(priority_lock && !high_priority); ut_ad(priority_lock);
ut_ad(!high_priority);
prio_rw_lock_t *prio_rw_lock = (prio_rw_lock_t *) lock; prio_rw_lock_t *prio_rw_lock = (prio_rw_lock_t *) lock;
return prio_rw_lock->high_priority_wait_ex_waiter > 0 return prio_rw_lock->high_priority_wait_ex_waiter > 0

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 44 #define INNODB_VERSION_BUGFIX 45
#ifndef PERCONA_INNODB_VERSION #ifndef PERCONA_INNODB_VERSION
#define PERCONA_INNODB_VERSION 86.0 #define PERCONA_INNODB_VERSION 86.1
#endif #endif
/* Enable UNIV_LOG_ARCHIVE in XtraDB */ /* Enable UNIV_LOG_ARCHIVE in XtraDB */

1
storage/xtradb/lock/lock0wait.cc
View File

@ -207,6 +207,7 @@ functions to get some info from THD.
@param[in] trx requested trx @param[in] trx requested trx
@param[in] blocking blocking info array @param[in] blocking blocking info array
@param[in] blocking_count blocking info array size */ @param[in] blocking_count blocking info array size */
static
void void
print_lock_wait_timeout( print_lock_wait_timeout(
const trx_t &trx, const trx_t &trx,

7
storage/xtradb/log/log0online.cc
View File

@ -91,7 +91,7 @@ static const char* bmp_file_name_stem = "ib_modified_log_";
/** File name template for bitmap files. The 1st format tag is a directory /** File name template for bitmap files. The 1st format tag is a directory
name, the 2nd tag is the stem, the 3rd tag is a file sequence number, the 4th name, the 2nd tag is the stem, the 3rd tag is a file sequence number, the 4th
tag is the start LSN for the file. */ tag is the start LSN for the file. */
static const char* bmp_file_name_template = "%s%s%lu_%llu.xdb"; static const char* bmp_file_name_template = "%s%s%lu_" LSN_PF ".xdb";
/* On server startup with empty database srv_start_lsn == 0, in /* On server startup with empty database srv_start_lsn == 0, in
which case the first LSN of actual log records will be this. */ which case the first LSN of actual log records will be this. */
@ -586,9 +586,8 @@ log_online_is_bitmap_file(
return ((file_info->type == OS_FILE_TYPE_FILE return ((file_info->type == OS_FILE_TYPE_FILE
|| file_info->type == OS_FILE_TYPE_LINK) || file_info->type == OS_FILE_TYPE_LINK)
&& (sscanf(file_info->name, "%[a-z_]%lu_%llu.xdb", stem, && (sscanf(file_info->name, "%[a-z_]%lu_" LSN_PF ".xdb", stem,
bitmap_file_seq_num, bitmap_file_seq_num, bitmap_file_start_lsn) == 3)
(unsigned long long *)bitmap_file_start_lsn) == 3)
&& (!strcmp(stem, bmp_file_name_stem))); && (!strcmp(stem, bmp_file_name_stem)));
} }

1
storage/xtradb/ut/ut0ut.cc
View File

@ -40,7 +40,6 @@ Created 5/11/1994 Heikki Tuuri
#include <ctype.h> #include <ctype.h>
#ifndef UNIV_HOTBACKUP #ifndef UNIV_HOTBACKUP
# include "btr0types.h"
# include "trx0trx.h" # include "trx0trx.h"
# include "ha_prototypes.h" # include "ha_prototypes.h"
# include "mysql_com.h" /* NAME_LEN */ # include "mysql_com.h" /* NAME_LEN */