Merge lp:~akopytov/percona-xtrabackup/bug1166888-2.0 into lp:percona-xtrabackup/2.0

Proposed by Alexey Kopytov on 2013-04-11
Status: Merged
Approved by: Laurynas Biveinis on 2013-04-15
Approved revision: 529
Merged at revision: 531
Proposed branch: lp:~akopytov/percona-xtrabackup/bug1166888-2.0
Merge into: lp:percona-xtrabackup/2.0
Diff against target: 24 lines (+7/-0)
1 file modified
src/xtrabackup.cc (+7/-0)
To merge this branch: bzr merge lp:~akopytov/percona-xtrabackup/bug1166888-2.0
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve on 2013-04-15
Registry Administrators 2013-04-11 Pending
Review via email: mp+158416@code.launchpad.net

Description of the change

    Bug #1166888: XtraBackup segfaults after period of time

    The problem was that that the log copying thread did not call
    my_thread_init() which resulted in a crash as soon as any mysys function
    tried to access my_thread_var.

    Fixed by calling my_thread_init() and my_thread_end() when necessary.

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.0-param/388/

To post a comment you must log in.
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/xtrabackup.cc'
--- src/xtrabackup.cc 2013-04-03 22:53:49 +0000
+++ src/xtrabackup.cc 2013-04-11 16:16:23 +0000
@@ -4502,6 +4502,12 @@
45024502
4503 ut_a(dst_log_fd != XB_FILE_UNDEFINED);4503 ut_a(dst_log_fd != XB_FILE_UNDEFINED);
45044504
4505 /*
4506 Initialize mysys thread-specific memory so we can
4507 use mysys functions in this thread.
4508 */
4509 my_thread_init();
4510
4505 log_copying_running = TRUE;4511 log_copying_running = TRUE;
45064512
4507 while(log_copying) {4513 while(log_copying) {
@@ -4522,6 +4528,7 @@
4522 log_copying_succeed = TRUE;4528 log_copying_succeed = TRUE;
4523end:4529end:
4524 log_copying_running = FALSE;4530 log_copying_running = FALSE;
4531 my_thread_end();
4525 os_thread_exit(NULL);4532 os_thread_exit(NULL);
45264533
4527 return(0);4534 return(0);

Subscribers

People subscribed via source and target branches