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

Merge lp://staging/~akopytov/percona-xtradb-cluster/pxc-178 into lp://staging/percona-xtradb-cluster

  1. pxc-178
  2. Merge into 5.6
Proposed by Alexey Kopytov
Status: Merged
Approved by: Raghavendra D Prabhu
Approved revision: no longer in the source branch.
Merge reported by: Alexey Kopytov
Merged at revision: not available
Proposed branch: lp://staging/~akopytov/percona-xtradb-cluster/pxc-178
Merge into: lp://staging/percona-xtradb-cluster
To merge this branch: bzr merge lp://staging/~akopytov/percona-xtradb-cluster/pxc-178
Reviewer Review Type Date Requested Status
Raghavendra D Prabhu Pending
Review via email: mp+238046@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Raghavendra D Prabhu (raghavendra-prabhu) wrote :

Folllowing diffs need to be checked:

a)

--- cmake/install_layout.cmake 2014-05-14 13:01:41 +0000
+++ cmake/install_layout.cmake 2014-10-11 06:46:30 +0000

-IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
+# Deciding via system processor may give wrong answer in
+# virtual environments that see host CPU directly.
+# IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
+IF(64BIT)
   SET(INSTALL_LIBDIR_RPM "lib64")
   SET(INSTALL_PLUGINDIR_RPM "lib64/mysql/plugin")
 ELSE()

b)
=== modified file cmake/package_name.cmake
--- cmake/package_name.cmake 2013-06-20 15:16:00 +0000
+++ cmake/package_name.cmake 2014-10-11 06:46:30 +0000
@@ -27,6 +27,8 @@
     SET(DEFAULT_MACHINE ${CMAKE_SYSTEM_PROCESSOR})
     IF(SIZEOF_VOIDP EQUAL 8)
       SET(64BIT 1)
+ ELSE()
+ SET(64BIT 0)
     ENDIF()

Revision history for this message
Alexey Kopytov (akopytov) wrote :

Those diffs look good to me.

Subscribers

People subscribed via source and target branches

to all changes: