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

Merge lp:~percona-core/percona-server/release-5.6.11-60.3 into lp:percona-server/5.6

  1. release-5.6.11-60.3
  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: 377
Proposed branch: lp:~percona-core/percona-server/release-5.6.11-60.3
Merge into: lp:percona-server/5.6
Diff against target: 159 lines (+14/-36)
6 files modified
Makefile (+1/-1)
Percona-Server/cmake/ssl.cmake (+1/-2)
build/debian/percona-server-client-5.6.install (+1/-0)
build/debian/rules (+2/-2)
build/percona-server.spec (+5/-3)
build/rpm/mysql-dubious-exports.patch (+4/-28)
To merge this branch: bzr merge lp:~percona-core/percona-server/release-5.6.11-60.3
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+167154@code.launchpad.net

Description of the change

Changes for release 5.6.11-60.3

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 'Makefile'
2--- Makefile 2013-05-31 08:06:00 +0000
3+++ Makefile 2013-06-03 21:32:28 +0000
4@@ -1,5 +1,5 @@
5 MYSQL_VERSION=5.6.11
6-PERCONA_SERVER_VERSION=alpha60.3
7+PERCONA_SERVER_VERSION=rc60.3
8 PERCONA_SERVER ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)
9 PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)
10 PERCONA_SERVER_SHORT_2 ?=Percona-Server
11
12=== modified file 'Percona-Server/cmake/ssl.cmake'
13--- Percona-Server/cmake/ssl.cmake 2013-05-12 06:24:46 +0000
14+++ Percona-Server/cmake/ssl.cmake 2013-06-03 21:32:28 +0000
15@@ -172,8 +172,7 @@
16
17 IF(OPENSSL_INCLUDE_DIR AND
18 OPENSSL_LIBRARY AND
19- CRYPTO_LIBRARY AND
20- OPENSSL_MAJOR_VERSION STREQUAL "1"
21+ CRYPTO_LIBRARY
22 )
23 SET(OPENSSL_FOUND TRUE)
24 ELSE()
25
26=== modified file 'build/debian/percona-server-client-5.6.install'
27--- build/debian/percona-server-client-5.6.install 2013-05-13 04:25:56 +0000
28+++ build/debian/percona-server-client-5.6.install 2013-06-03 21:32:28 +0000
29@@ -30,3 +30,4 @@
30 usr/share/man/man1/mysql_waitpid.1
31 usr/share/man/man1/mysql_client_test.1
32 usr/share/man/man1/mysqlslap.1
33+usr/share/man/man1/mysql_config_editor.1
34
35=== modified file 'build/debian/rules'
36--- build/debian/rules 2013-05-31 08:06:00 +0000
37+++ build/debian/rules 2013-06-03 21:32:28 +0000
38@@ -9,9 +9,9 @@
39
40 feature_set="community"
41 major_version=60
42-minor_version=2
43+minor_version=3
44 compilation_comment_release="Percona Server (GPL), Release $(major_version).$(minor_version)"
45-server_suffix="-$(major_version).$(minor_version)"
46+server_suffix="-rc$(major_version).$(minor_version)"
47 prefix="/usr"
48
49 clean: clean-patched unpatch
50
51=== modified file 'build/percona-server.spec'
52--- build/percona-server.spec 2013-06-03 01:39:13 +0000
53+++ build/percona-server.spec 2013-06-03 21:32:28 +0000
54@@ -28,15 +28,15 @@
55 %define mysql_version 5.6.11
56 %define redhatversion %(lsb_release -rs | awk -F. '{ print $1}')
57 %define majorversion 60
58-%define minorversion 2
59+%define minorversion 3
60 %define distribution rhel%{redhatversion}
61-%define percona_server_version alpha%{majorversion}.%{minorversion}
62+%define percona_server_version rc%{majorversion}.%{minorversion}
63
64 %define mysqld_user mysql
65 %define mysqld_group mysql
66 %define mysqldatadir /var/lib/mysql
67
68-%define release alpha%{majorversion}.%{minorversion}.%{gotrevision}.%{distribution}
69+%define release rc%{majorversion}.%{minorversion}.%{gotrevision}.%{distribution}
70
71 #
72 # Macros we use which are not available in all supported versions of RPM
73@@ -974,6 +974,7 @@
74 %doc %attr(644, root, man) %{_mandir}/man1/resolve_stack_dump.1*
75 %doc %attr(644, root, man) %{_mandir}/man1/resolveip.1*
76 %doc %attr(644, root, man) %{_mandir}/man1/mysql_plugin.1*
77+%doc %attr(644, root, man) %{_mandir}/man8/mysqld.8*
78
79 %ghost %config(noreplace,missingok) %{_sysconfdir}/my.cnf
80
81@@ -1086,6 +1087,7 @@
82 %doc %attr(644, root, man) %{_mandir}/man1/mysqlimport.1*
83 %doc %attr(644, root, man) %{_mandir}/man1/mysqlshow.1*
84 %doc %attr(644, root, man) %{_mandir}/man1/mysqlslap.1*
85+%doc %attr(644, root, man) %{_mandir}/man1/mysql_config_editor.1*
86
87 # ----------------------------------------------------------------------------
88 %files -n Percona-Server-devel%{product_suffix} -f optional-files-devel
89
90=== modified file 'build/rpm/mysql-dubious-exports.patch'
91--- build/rpm/mysql-dubious-exports.patch 2013-05-27 03:01:29 +0000
92+++ build/rpm/mysql-dubious-exports.patch 2013-06-03 21:32:28 +0000
93@@ -22,22 +22,10 @@
94 else
95 crypted_pw[0]=0; /* No password */
96
97-=== modified file 'Percona-Server/include/errmsg.h'
98---- Percona-Server/include/errmsg.h 2013-04-15 06:52:16 +0000
99-+++ Percona-Server/include/errmsg.h 2013-04-15 07:08:31 +0000
100-@@ -25,6 +25,7 @@
101- void init_client_errs(void);
102- void finish_client_errs(void);
103- extern const char *client_errors[]; /* Error messages */
104-+extern const char **mysql_client_errors; /* Error messages */
105- #ifdef __cplusplus
106- }
107- #endif
108-
109 === modified file 'Percona-Server/include/my_sys.h'
110 --- Percona-Server/include/my_sys.h 2013-03-05 12:46:43 +0000
111 +++ Percona-Server/include/my_sys.h 2013-04-15 07:08:10 +0000
112-@@ -260,6 +260,7 @@
113+@@ -261,6 +261,7 @@
114
115 /* charsets */
116 #define MY_ALL_CHARSETS_SIZE 2048
117@@ -76,7 +64,7 @@
118 === modified file 'Percona-Server/include/mysql_com.h'
119 --- Percona-Server/include/mysql_com.h 2013-03-05 12:46:43 +0000
120 +++ Percona-Server/include/mysql_com.h 2013-04-15 07:08:10 +0000
121-@@ -482,6 +482,7 @@
122+@@ -497,6 +497,7 @@
123 void my_net_local_init(NET *net);
124 void net_end(NET *net);
125 void net_clear(NET *net, my_bool check_buffer);
126@@ -84,7 +72,7 @@
127 my_bool net_realloc(NET *net, size_t length);
128 my_bool net_flush(NET *net);
129 my_bool my_net_write(NET *net,const unsigned char *packet, size_t len);
130-@@ -559,14 +560,12 @@
131+@@ -574,14 +575,12 @@
132 void create_random_string(char *to, unsigned int length, struct rand_struct *rand_st);
133
134 void hash_password(unsigned long *to, const char *password, unsigned int password_len);
135@@ -103,7 +91,7 @@
136 === modified file 'Percona-Server/libmysql/CMakeLists.txt'
137 --- Percona-Server/libmysql/CMakeLists.txt 2013-04-15 06:52:16 +0000
138 +++ Percona-Server/libmysql/CMakeLists.txt 2013-04-15 07:08:10 +0000
139-@@ -221,7 +221,7 @@
140+@@ -224,7 +224,7 @@
141 SET(libmysql_link_flags
142 "${libmysql_link_flags} ${LINK_FLAG_NO_UNDEFINED}")
143 SET(libmysql_link_flags
144@@ -113,15 +101,3 @@
145 PROPERTIES LINK_FLAGS "${libmysql_link_flags}")
146 ENDIF()
147
148-=== modified file 'Percona-Server/libmysql/errmsg.c'
149---- Percona-Server/libmysql/errmsg.c 2013-04-15 06:52:16 +0000
150-+++ Percona-Server/libmysql/errmsg.c 2013-04-15 07:08:10 +0000
151-@@ -23,6 +23,7 @@
152- #include <my_sys.h>
153- #include "errmsg.h"
154-
155-+const char **mysql_client_errors = client_errors;
156- const char *client_errors[]=
157- {
158- "Unknown MySQL error",
159-

Subscribers

People subscribed via source and target branches

to all changes: