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

Merge mysql-5.1 to mysql-5.5.

Browse Source
This commit is contained in:
Marko Mäkelä 2013-02-08 09:33:21 +02:00
commit 62eaf89ff0
2 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
storage/innobase/srv/srv0srv.c
View File

@ -1,6 +1,6 @@
/***************************************************************************** /*****************************************************************************
Copyright (c) 1995, 2012, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 1995, 2013, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2008, 2009 Google Inc. Copyright (c) 2008, 2009 Google Inc.
Copyright (c) 2009, Percona Inc. Copyright (c) 2009, Percona Inc.
@ -279,7 +279,7 @@ UNIV_INTERN ulint srv_data_read = 0;
/* Internal setting for "innodb_stats_method". Decides how InnoDB treats /* Internal setting for "innodb_stats_method". Decides how InnoDB treats
NULL value when collecting statistics. By default, it is set to NULL value when collecting statistics. By default, it is set to
SRV_STATS_NULLS_EQUAL(0), ie. all NULL value are treated equal */ SRV_STATS_NULLS_EQUAL(0), ie. all NULL value are treated equal */
ulong srv_innodb_stats_method = SRV_STATS_NULLS_EQUAL; UNIV_INTERN ulong srv_innodb_stats_method = SRV_STATS_NULLS_EQUAL;
/* here we count the amount of data written in total (in bytes) */ /* here we count the amount of data written in total (in bytes) */
UNIV_INTERN ulint srv_data_written = 0; UNIV_INTERN ulint srv_data_written = 0;
@ -2105,19 +2105,31 @@ srv_export_innodb_status(void)
export_vars.innodb_truncated_status_writes = srv_truncated_status_writes; export_vars.innodb_truncated_status_writes = srv_truncated_status_writes;
#ifdef UNIV_DEBUG #ifdef UNIV_DEBUG
if (trx_sys->max_trx_id < purge_sys->done_trx_no) { {
export_vars.innodb_purge_trx_id_age = 0; trx_id_t done_trx_no;
} else { trx_id_t up_limit_id;
export_vars.innodb_purge_trx_id_age =
trx_sys->max_trx_id - purge_sys->done_trx_no;
}
if (!purge_sys->view rw_lock_s_lock(&purge_sys->latch);
|| trx_sys->max_trx_id < purge_sys->view->up_limit_id) { done_trx_no = purge_sys->done_trx_no;
export_vars.innodb_purge_view_trx_id_age = 0; up_limit_id = purge_sys->view
} else { ? purge_sys->view->up_limit_id
export_vars.innodb_purge_view_trx_id_age = : 0;
trx_sys->max_trx_id - purge_sys->view->up_limit_id; rw_lock_s_unlock(&purge_sys->latch);
if (trx_sys->max_trx_id < done_trx_no) {
export_vars.innodb_purge_trx_id_age = 0;
} else {
export_vars.innodb_purge_trx_id_age =
trx_sys->max_trx_id - done_trx_no;
}
if (!up_limit_id
|| trx_sys->max_trx_id < up_limit_id) {
export_vars.innodb_purge_view_trx_id_age = 0;
} else {
export_vars.innodb_purge_view_trx_id_age =
trx_sys->max_trx_id - up_limit_id;
}
} }
#endif /* UNIV_DEBUG */ #endif /* UNIV_DEBUG */

2
storage/innobase/trx/trx0sys.c
View File

@ -137,7 +137,7 @@ UNIV_INTERN mysql_pfs_key_t file_format_max_mutex_key;
#ifndef UNIV_HOTBACKUP #ifndef UNIV_HOTBACKUP
#ifdef UNIV_DEBUG #ifdef UNIV_DEBUG
/* Flag to control TRX_RSEG_N_SLOTS behavior debugging. */ /* Flag to control TRX_RSEG_N_SLOTS behavior debugging. */
uint trx_rseg_n_slots_debug = 0; UNIV_INTERN uint trx_rseg_n_slots_debug = 0;
#endif #endif
/** This is used to track the maximum file format id known to InnoDB. It's /** This is used to track the maximum file format id known to InnoDB. It's