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

5.5.59-38.11

Browse Source
This commit is contained in:
Sergei Golubchik 2018-04-20 01:01:56 +02:00
parent 85a5e58d71
commit 4fd1c7e453
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,7 +64,7 @@ component, i.e. we show M.N.P as M.N */
(INNODB_VERSION_MAJOR << 8 | INNODB_VERSION_MINOR) (INNODB_VERSION_MAJOR << 8 | INNODB_VERSION_MINOR)
#ifndef PERCONA_INNODB_VERSION #ifndef PERCONA_INNODB_VERSION
#define PERCONA_INNODB_VERSION 38.10 #define PERCONA_INNODB_VERSION 38.11
#endif #endif
#define INNODB_VERSION_STR MYSQL_SERVER_VERSION #define INNODB_VERSION_STR MYSQL_SERVER_VERSION

17
storage/xtradb/trx/trx0purge.c
View File

@ -1,6 +1,6 @@
/***************************************************************************** /*****************************************************************************
Copyright (c) 1996, 2012, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved.
This program is free software; you can redistribute it and/or modify it under This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software the terms of the GNU General Public License as published by the Free Software
@ -729,6 +729,7 @@ trx_purge_rseg_get_next_history_log(
mutex_exit(&(rseg->mutex)); mutex_exit(&(rseg->mutex));
mtr_commit(&mtr); mtr_commit(&mtr);
#ifdef UNIV_DEBUG
mutex_enter(&kernel_mutex); mutex_enter(&kernel_mutex);
/* Add debug code to track history list corruption reported /* Add debug code to track history list corruption reported
@ -742,18 +743,20 @@ trx_purge_rseg_get_next_history_log(
if (trx_sys->rseg_history_len > 2000000) { if (trx_sys->rseg_history_len > 2000000) {
ut_print_timestamp(stderr); ut_print_timestamp(stderr);
fprintf(stderr, fprintf(stderr,
" InnoDB: Warning: purge reached the" " InnoDB: Warning: purge reached the"
" head of the history list,\n" " head of the history list,\n"
"InnoDB: but its length is still" "InnoDB: but its length is still"
" reported as %lu! Make a detailed bug\n" " reported as %lu!."
"InnoDB: report, and submit it" " This can happen becasue a long"
" to http://bugs.mysql.com\n", " running transaction is withholding"
" purging of undo logs or a read"
" view is open. Please try to commit"
" the long running transaction.",
(ulong) trx_sys->rseg_history_len); (ulong) trx_sys->rseg_history_len);
ut_ad(0);
} }
mutex_exit(&kernel_mutex); mutex_exit(&kernel_mutex);
#endif
return; return;
} }