Percona Server moved to https://jira.percona.com/projects/PS

Merge lp:~sergei.glushchenko/percona-server/BT19549-bug1166622-5.6 into lp:percona-server/5.6

  1. BT19549-bug1166622-5.6
  2. Merge into 5.6
Proposed by Sergei Glushchenko
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
Merged at revision: 336
Proposed branch: lp:~sergei.glushchenko/percona-server/BT19549-bug1166622-5.6
Merge into: lp:percona-server/5.6
Diff against target: 41 lines (+9/-3)
2 files modified
Percona-Server/storage/innobase/include/log0log.h (+1/-0)
Percona-Server/storage/innobase/log/log0log.cc (+8/-3)
To merge this branch: bzr merge lp:~sergei.glushchenko/percona-server/BT19549-bug1166622-5.6
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+158205@code.launchpad.net

Description of the change

Deallocate archive_buf

http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/76/

To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Percona-Server/storage/innobase/include/log0log.h'
2--- Percona-Server/storage/innobase/include/log0log.h 2013-04-03 22:45:59 +0000
3+++ Percona-Server/storage/innobase/include/log0log.h 2013-04-10 19:36:26 +0000
4@@ -977,6 +977,7 @@
5 should wait for this without owning
6 the log mutex */
7 ulint archive_buf_size;/*!< size of archive_buf */
8+ byte* archive_buf_ptr;/*!< unaligned archived_buf */
9 byte* archive_buf; /*!< log segment is written to the
10 archive from this buffer */
11 os_event_t archiving_on; /*!< if archiving has been stopped,
12
13=== modified file 'Percona-Server/storage/innobase/log/log0log.cc'
14--- Percona-Server/storage/innobase/log/log0log.cc 2013-04-03 22:45:59 +0000
15+++ Percona-Server/storage/innobase/log/log0log.cc 2013-04-10 19:36:26 +0000
16@@ -819,10 +819,12 @@
17 rw_lock_create(archive_lock_key, &log_sys->archive_lock,
18 SYNC_NO_ORDER_CHECK);
19
20+ log_sys->archive_buf_ptr = static_cast<byte*>(
21+ mem_zalloc(LOG_ARCHIVE_BUF_SIZE + OS_FILE_LOG_BLOCK_SIZE));
22+
23 log_sys->archive_buf = static_cast<byte*>(
24- ut_align(mem_zalloc(LOG_ARCHIVE_BUF_SIZE
25- + OS_FILE_LOG_BLOCK_SIZE),
26- OS_FILE_LOG_BLOCK_SIZE));
27+ ut_align(log_sys->archive_buf_ptr, OS_FILE_LOG_BLOCK_SIZE));
28+
29 log_sys->archive_buf_size = LOG_ARCHIVE_BUF_SIZE;
30
31 log_sys->archiving_on = os_event_create();
32@@ -3625,6 +3627,9 @@
33 mem_free(log_sys->checkpoint_buf_ptr);
34 log_sys->checkpoint_buf_ptr = NULL;
35 log_sys->checkpoint_buf = NULL;
36+ mem_free(log_sys->archive_buf_ptr);
37+ log_sys->archive_buf_ptr = NULL;
38+ log_sys->archive_buf = NULL;
39
40 os_event_free(log_sys->no_flush_event);
41 os_event_free(log_sys->one_flushed_event);

Subscribers

People subscribed via source and target branches