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

Merge lp:~percona-core/percona-server/release-5.6.12-60.4-rc2 into lp:percona-server/5.6

  1. release-5.6.12-60.4-rc2
  2. Merge into 5.6
Proposed by Ignacio Nin
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
Merged at revision: 397
Proposed branch: lp:~percona-core/percona-server/release-5.6.12-60.4-rc2
Merge into: lp:percona-server/5.6
Diff against target: 69 lines (+7/-4)
4 files modified
build/build-binary.sh (+3/-0)
build/debian/percona-server-server-5.6.preinst (+1/-1)
build/debian/rules (+1/-1)
build/percona-server.spec (+2/-2)
To merge this branch: bzr merge lp:~percona-core/percona-server/release-5.6.12-60.4-rc2
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+172130@code.launchpad.net

Description of the change

Changes for release 5.6.12-60.4

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 'build/build-binary.sh'
2--- build/build-binary.sh 2013-06-25 13:13:06 +0000
3+++ build/build-binary.sh 2013-06-28 19:15:44 +0000
4@@ -17,6 +17,7 @@
5 TARGET_CFLAGS=''
6 QUIET='VERBOSE=1'
7 WITH_JEMALLOC=''
8+DEBUG_EXTNAME=''
9
10 # Some programs that may be overriden
11 TAR=${TAR:-tar}
12@@ -44,6 +45,7 @@
13 shift
14 CMAKE_BUILD_TYPE='Debug'
15 BUILD_COMMENT="${BUILD_COMMENT:-}-debug"
16+ DEBUG_EXTNAME='-DDEBUG_EXTNAME=OFF'
17 ;;
18 -v | --valgrind )
19 shift
20@@ -153,6 +155,7 @@
21 cd "$PRODUCT"
22 cmake . ${CMAKE_OPTS:-} -DBUILD_CONFIG=mysql_release \
23 -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:-RelWithDebInfo} \
24+ $DEBUG_EXTNAME \
25 -DWITH_EMBEDDED_SERVER=OFF \
26 -DFEATURE_SET=community \
27 -DENABLE_DTRACE=OFF \
28
29=== modified file 'build/debian/percona-server-server-5.6.preinst'
30--- build/debian/percona-server-server-5.6.preinst 2013-05-10 13:29:38 +0000
31+++ build/debian/percona-server-server-5.6.preinst 2013-06-28 19:15:44 +0000
32@@ -48,7 +48,7 @@
33
34 ################################ main() ##########################
35
36-this_version=5.5
37+this_version=5.6
38
39 # Check kernel version
40 if dpkg --compare-versions `uname -r` lt 2.6; then
41
42=== modified file 'build/debian/rules'
43--- build/debian/rules 2013-06-25 13:13:06 +0000
44+++ build/debian/rules 2013-06-28 19:15:44 +0000
45@@ -9,7 +9,7 @@
46
47 feature_set="community"
48 major_version=60
49-minor_version=3
50+minor_version=4
51 compilation_comment_release="Percona Server (GPL), Release $(major_version).$(minor_version)"
52 server_suffix="-rc$(major_version).$(minor_version)"
53 prefix="/usr"
54
55=== modified file 'build/percona-server.spec'
56--- build/percona-server.spec 2013-06-25 13:13:06 +0000
57+++ build/percona-server.spec 2013-06-28 19:15:44 +0000
58@@ -25,10 +25,10 @@
59 %define mysql_vendor Oracle and/or its affiliates
60 %define percona_server_vendor Percona, Inc
61
62-%define mysql_version 5.6.11
63+%define mysql_version 5.6.12
64 %define redhatversion %(lsb_release -rs | awk -F. '{ print $1}')
65 %define majorversion 60
66-%define minorversion 3
67+%define minorversion 4
68 %define distribution rhel%{redhatversion}
69 %define percona_server_version rc%{majorversion}.%{minorversion}
70

Subscribers

People subscribed via source and target branches

to all changes: