Percona XtraDB Cluster moved to https://jira.percona.com/projects/PXC

Merge lp:~akopytov/percona-xtradb-cluster/bug1384413 into lp:percona-xtradb-cluster

  1. bug1384413
  2. Merge into 5.6
Proposed by Alexey Kopytov
Status: Merged
Approved by: Raghavendra D Prabhu
Approved revision: 911
Merge reported by: Alexey Kopytov
Merged at revision: not available
Proposed branch: lp:~akopytov/percona-xtradb-cluster/bug1384413
Merge into: lp:percona-xtradb-cluster
Diff against target: 24 lines (+1/-2)
2 files modified
storage/innobase/handler/ha_innodb.cc (+0/-1)
storage/innobase/lock/lock0lock.cc (+1/-1)
To merge this branch: bzr merge lp:~akopytov/percona-xtradb-cluster/bug1384413
Reviewer Review Type Date Requested Status
Raghavendra D Prabhu Pending
Review via email: mp+239282@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Raghavendra D Prabhu (raghavendra-prabhu) wrote :

Approved.

Revision history for this message
Raghavendra D Prabhu (raghavendra-prabhu) wrote :

Merged.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'storage/innobase/handler/ha_innodb.cc'
2--- storage/innobase/handler/ha_innodb.cc 2014-10-11 06:46:30 +0000
3+++ storage/innobase/handler/ha_innodb.cc 2014-10-22 19:48:12 +0000
4@@ -10066,7 +10066,6 @@
5 uint len;
6 char keyval[WSREP_MAX_SUPPORTED_KEY_LENGTH+1] = {'\0'};
7 char *key = &keyval[0];
8- KEY *key_info = table->key_info;
9 ibool is_null;
10
11 len = wsrep_store_key_val_for_row(
12
13=== modified file 'storage/innobase/lock/lock0lock.cc'
14--- storage/innobase/lock/lock0lock.cc 2014-10-11 06:46:30 +0000
15+++ storage/innobase/lock/lock0lock.cc 2014-10-22 19:48:12 +0000
16@@ -1798,7 +1798,7 @@
17 return(trx_id);
18 }
19
20-#ifdef UNIV_DEBUG
21+#if defined(UNIV_DEBUG) && !defined(WITH_WSREP)
22 /*********************************************************************//**
23 Checks if some transaction, other than given trx_id, has an explicit
24 lock on the given rec, in the given precise_mode.

Subscribers

People subscribed via source and target branches

to all changes: