Percona XtraBackup moved to https://jira.percona.com/projects/PXB

Merge lp:~akopytov/percona-xtrabackup/single-binary-fixes into lp:percona-xtrabackup/2.2

  1. single-binary-fixes
  2. Merge into 2.2
Proposed by Alexey Kopytov
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
Merged at revision: 4909
Proposed branch: lp:~akopytov/percona-xtrabackup/single-binary-fixes
Merge into: lp:percona-xtrabackup/2.2
Diff against target: 40 lines (+10/-0)
2 files modified
storage/innobase/srv/srv0mon.cc (+2/-0)
storage/innobase/xtrabackup/src/CMakeLists.txt (+8/-0)
To merge this branch: bzr merge lp:~akopytov/percona-xtrabackup/single-binary-fixes
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+197034@code.launchpad.net
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 'storage/innobase/srv/srv0mon.cc'
2--- storage/innobase/srv/srv0mon.cc 2013-11-27 08:36:11 +0000
3+++ storage/innobase/srv/srv0mon.cc 2013-11-28 10:32:14 +0000
4@@ -1211,8 +1211,10 @@
5 built-in operations for atomic memory access */
6 ib_mutex_t monitor_mutex;
7
8+#ifdef UNIV_PFS_MUTEX
9 /** Key to register monitor_mutex with performance schema */
10 UNIV_INTERN mysql_pfs_key_t monitor_mutex_key;
11+#endif
12
13 /****************************************************************//**
14 Initialize the monitor subsystem. */
15
16=== modified file 'storage/innobase/xtrabackup/src/CMakeLists.txt'
17--- storage/innobase/xtrabackup/src/CMakeLists.txt 2013-11-26 10:44:44 +0000
18+++ storage/innobase/xtrabackup/src/CMakeLists.txt 2013-11-28 10:32:14 +0000
19@@ -76,6 +76,10 @@
20 xbstream_write.c
21 )
22
23+SET_TARGET_PROPERTIES(xbstream
24+ PROPERTIES LINKER_LANGUAGE CXX
25+ )
26+
27 TARGET_LINK_LIBRARIES(xbstream
28 mysys
29 mysys_ssl
30@@ -91,6 +95,10 @@
31 xbcrypt_write.c
32 )
33
34+SET_TARGET_PROPERTIES(xbcrypt
35+ PROPERTIES LINKER_LANGUAGE CXX
36+ )
37+
38 TARGET_LINK_LIBRARIES(xbcrypt
39 ${GCRYPT_LIBS}
40 mysys

Subscribers

People subscribed via source and target branches

to all changes: