Merge lp:~akopytov/percona-server/bug1123915 into lp:percona-server/5.5

Proposed by Alexey Kopytov on 2013-02-21
Status: Merged
Approved by: Sergei Glushchenko on 2013-02-25
Approved revision: 451
Merged at revision: 453
Proposed branch: lp:~akopytov/percona-server/bug1123915
Merge into: lp:percona-server/5.5
Diff against target: 46 lines (+19/-16)
1 file modified
Percona-Server/storage/innobase/handler/ha_innodb.cc (+19/-16)
To merge this branch: bzr merge lp:~akopytov/percona-server/bug1123915
Reviewer Review Type Date Requested Status
Sergei Glushchenko (community) g2 2013-02-21 Approve on 2013-02-25
Review via email: mp+149822@code.launchpad.net
To post a comment you must log in.

Approve

review: Approve (g2)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Percona-Server/storage/innobase/handler/ha_innodb.cc'
2--- Percona-Server/storage/innobase/handler/ha_innodb.cc 2013-02-13 20:31:43 +0000
3+++ Percona-Server/storage/innobase/handler/ha_innodb.cc 2013-02-21 13:04:46 +0000
4@@ -10359,23 +10359,26 @@
5
6 if (trx->n_mysql_tables_in_use == 0) {
7 #ifdef EXTENDED_SLOWLOG
8- increment_thd_innodb_stats(thd,
9- (unsigned long long) trx->id,
10- trx->io_reads,
11- trx->io_read,
12- trx->io_reads_wait_timer,
13- trx->lock_que_wait_timer,
14- trx->innodb_que_wait_timer,
15- trx->distinct_page_access);
16+ if (UNIV_UNLIKELY(trx->take_stats)) {
17+ increment_thd_innodb_stats(thd,
18+ (unsigned long long) trx->id,
19+ trx->io_reads,
20+ trx->io_read,
21+ trx->io_reads_wait_timer,
22+ trx->lock_que_wait_timer,
23+ trx->innodb_que_wait_timer,
24+ trx->distinct_page_access);
25
26- trx->io_reads = 0;
27- trx->io_read = 0;
28- trx->io_reads_wait_timer = 0;
29- trx->lock_que_wait_timer = 0;
30- trx->innodb_que_wait_timer = 0;
31- trx->distinct_page_access = 0;
32- if (trx->distinct_page_access_hash)
33- memset(trx->distinct_page_access_hash, 0, DPAH_SIZE);
34+ trx->io_reads = 0;
35+ trx->io_read = 0;
36+ trx->io_reads_wait_timer = 0;
37+ trx->lock_que_wait_timer = 0;
38+ trx->innodb_que_wait_timer = 0;
39+ trx->distinct_page_access = 0;
40+ if (trx->distinct_page_access_hash)
41+ memset(trx->distinct_page_access_hash, 0,
42+ DPAH_SIZE);
43+ }
44 #endif
45
46 trx->mysql_n_tables_locked = 0;

Subscribers

People subscribed via source and target branches