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

Merge lp:~laurynas-biveinis/percona-server/bug1239630 into lp:percona-server/5.5

  1. bug1239630
  2. Merge into 5.5
Proposed by Laurynas Biveinis
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
Merged at revision: 585
Proposed branch: lp:~laurynas-biveinis/percona-server/bug1239630
Merge into: lp:percona-server/5.5
Diff against target: 17 lines (+5/-2)
1 file modified
Percona-Server/storage/innobase/handler/ha_innodb.cc (+5/-2)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/bug1239630
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+190957@code.launchpad.net

Description of the change

Fix bug 1239630 (Numerous test failures due to NULL dereference in
trx_search_latch_if_reserved()).

Fix a merge mistake by restoring the intended logic:
innobase_release_temporary_latches() must only call
trx_search_latch_if_reserved if trx != NULL.

http://jenkins.percona.com/job/percona-server-5.5-param/886/

This is IMHO obvious, but will leave open for a day for a G2 or KAlexey's review.

To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) :
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/handler/ha_innodb.cc'
2--- Percona-Server/storage/innobase/handler/ha_innodb.cc 2013-09-24 12:47:59 +0000
3+++ Percona-Server/storage/innobase/handler/ha_innodb.cc 2013-10-14 13:47:06 +0000
4@@ -1123,8 +1123,11 @@
5
6 trx = thd_to_trx(thd);
7
8- /* No-op in XtraDB */
9- trx_search_latch_release_if_reserved(trx);
10+ if (trx != NULL) {
11+
12+ /* No-op in XtraDB */
13+ trx_search_latch_release_if_reserved(trx);
14+ }
15
16 return(0);
17 }

Subscribers

People subscribed via source and target branches