Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
62eaf89f
Commit
62eaf89f
authored
Feb 08, 2013
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql-5.1 to mysql-5.5.
parents
64b2ecce
5620418c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
15 deletions
+27
-15
storage/innobase/srv/srv0srv.c
storage/innobase/srv/srv0srv.c
+26
-14
storage/innobase/trx/trx0sys.c
storage/innobase/trx/trx0sys.c
+1
-1
No files found.
storage/innobase/srv/srv0srv.c
View file @
62eaf89f
/*****************************************************************************
Copyright (c) 1995, 201
2
, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 1995, 201
3
, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2008, 2009 Google 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
NULL value when collecting statistics. By default, it is set to
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) */
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
;
#ifdef UNIV_DEBUG
if
(
trx_sys
->
max_trx_id
<
purge_sys
->
done_trx_no
)
{
export_vars
.
innodb_purge_trx_id_age
=
0
;
}
else
{
export_vars
.
innodb_purge_trx_id_age
=
trx_sys
->
max_trx_id
-
purge_sys
->
done_trx_no
;
}
{
trx_id_t
done_trx_no
;
trx_id_t
up_limit_id
;
rw_lock_s_lock
(
&
purge_sys
->
latch
);
done_trx_no
=
purge_sys
->
done_trx_no
;
up_limit_id
=
purge_sys
->
view
?
purge_sys
->
view
->
up_limit_id
:
0
;
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
(
!
purge_sys
->
view
||
trx_sys
->
max_trx_id
<
purge_sys
->
view
->
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
-
purge_sys
->
view
->
up_limit_id
;
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 */
...
...
storage/innobase/trx/trx0sys.c
View file @
62eaf89f
...
...
@@ -137,7 +137,7 @@ UNIV_INTERN mysql_pfs_key_t file_format_max_mutex_key;
#ifndef UNIV_HOTBACKUP
#ifdef UNIV_DEBUG
/* 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
/** This is used to track the maximum file format id known to InnoDB. It's
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment