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

[Ignacio Nin]

Changes for release 5.6.11-60.3

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'Makefile'
--- Makefile	2013-05-31 08:06:00 +0000
+++ Makefile	2013-06-03 21:32:28 +0000
@@ -1,5 +1,5 @@
 MYSQL_VERSION=5.6.11
-PERCONA_SERVER_VERSION=alpha60.3
+PERCONA_SERVER_VERSION=rc60.3
 PERCONA_SERVER         ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)
 PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)
 PERCONA_SERVER_SHORT_2 ?=Percona-Server
 
=== modified file 'Percona-Server/cmake/ssl.cmake'
--- Percona-Server/cmake/ssl.cmake	2013-05-12 06:24:46 +0000
+++ Percona-Server/cmake/ssl.cmake	2013-06-03 21:32:28 +0000
@@ -172,8 +172,7 @@
 
     IF(OPENSSL_INCLUDE_DIR AND
        OPENSSL_LIBRARY   AND
-       CRYPTO_LIBRARY      AND
-       OPENSSL_MAJOR_VERSION STREQUAL "1"
+       CRYPTO_LIBRARY
       )
       SET(OPENSSL_FOUND TRUE)
     ELSE()
 
=== modified file 'build/debian/percona-server-client-5.6.install'
--- build/debian/percona-server-client-5.6.install	2013-05-13 04:25:56 +0000
+++ build/debian/percona-server-client-5.6.install	2013-06-03 21:32:28 +0000
@@ -30,3 +30,4 @@
 usr/share/man/man1/mysql_waitpid.1
 usr/share/man/man1/mysql_client_test.1
 usr/share/man/man1/mysqlslap.1
+usr/share/man/man1/mysql_config_editor.1
 
=== modified file 'build/debian/rules'
--- build/debian/rules	2013-05-31 08:06:00 +0000
+++ build/debian/rules	2013-06-03 21:32:28 +0000
@@ -9,9 +9,9 @@
 
 feature_set="community"
 major_version=60
-minor_version=2
+minor_version=3
 compilation_comment_release="Percona Server (GPL), Release $(major_version).$(minor_version)"
-server_suffix="-$(major_version).$(minor_version)"
+server_suffix="-rc$(major_version).$(minor_version)"
 prefix="/usr"
 
 clean: clean-patched unpatch
 
=== modified file 'build/percona-server.spec'
--- build/percona-server.spec	2013-06-03 01:39:13 +0000
+++ build/percona-server.spec	2013-06-03 21:32:28 +0000
@@ -28,15 +28,15 @@
 %define mysql_version   5.6.11
 %define redhatversion %(lsb_release -rs | awk -F. '{ print $1}')
 %define majorversion 60
-%define minorversion 2
+%define minorversion 3
 %define distribution  rhel%{redhatversion}
-%define percona_server_version	alpha%{majorversion}.%{minorversion}
+%define percona_server_version	rc%{majorversion}.%{minorversion}
 
 %define mysqld_user     mysql
 %define mysqld_group    mysql
 %define mysqldatadir    /var/lib/mysql
 
-%define release         alpha%{majorversion}.%{minorversion}.%{gotrevision}.%{distribution}
+%define release         rc%{majorversion}.%{minorversion}.%{gotrevision}.%{distribution}
 
 #
 # Macros we use which are not available in all supported versions of RPM
@@ -974,6 +974,7 @@
 %doc %attr(644, root, man) %{_mandir}/man1/resolve_stack_dump.1*
 %doc %attr(644, root, man) %{_mandir}/man1/resolveip.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysql_plugin.1*
+%doc %attr(644, root, man) %{_mandir}/man8/mysqld.8*
 
 %ghost %config(noreplace,missingok) %{_sysconfdir}/my.cnf
 
@@ -1086,6 +1087,7 @@
 %doc %attr(644, root, man) %{_mandir}/man1/mysqlimport.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysqlshow.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysqlslap.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysql_config_editor.1*
 
 # ----------------------------------------------------------------------------
 %files -n Percona-Server-devel%{product_suffix} -f optional-files-devel
 
=== modified file 'build/rpm/mysql-dubious-exports.patch'
--- build/rpm/mysql-dubious-exports.patch	2013-05-27 03:01:29 +0000
+++ build/rpm/mysql-dubious-exports.patch	2013-06-03 21:32:28 +0000
@@ -22,22 +22,10 @@
        else
  	crypted_pw[0]=0;			/* No password */
 
-=== modified file 'Percona-Server/include/errmsg.h'
---- Percona-Server/include/errmsg.h	2013-04-15 06:52:16 +0000
-+++ Percona-Server/include/errmsg.h	2013-04-15 07:08:31 +0000
-@@ -25,6 +25,7 @@
- void	init_client_errs(void);
- void	finish_client_errs(void);
- extern const char *client_errors[];	/* Error messages */
-+extern const char **mysql_client_errors;	/* Error messages */
- #ifdef	__cplusplus
- }
- #endif
-
 === modified file 'Percona-Server/include/my_sys.h'
 --- Percona-Server/include/my_sys.h	2013-03-05 12:46:43 +0000
 +++ Percona-Server/include/my_sys.h	2013-04-15 07:08:10 +0000
-@@ -260,6 +260,7 @@
+@@ -261,6 +261,7 @@
  
  /* charsets */
  #define MY_ALL_CHARSETS_SIZE 2048
@@ -76,7 +64,7 @@
 === modified file 'Percona-Server/include/mysql_com.h'
 --- Percona-Server/include/mysql_com.h	2013-03-05 12:46:43 +0000
 +++ Percona-Server/include/mysql_com.h	2013-04-15 07:08:10 +0000
-@@ -482,6 +482,7 @@
+@@ -497,6 +497,7 @@
  void my_net_local_init(NET *net);
  void net_end(NET *net);
  void net_clear(NET *net, my_bool check_buffer);
@@ -84,7 +72,7 @@
  my_bool net_realloc(NET *net, size_t length);
  my_bool	net_flush(NET *net);
  my_bool	my_net_write(NET *net,const unsigned char *packet, size_t len);
-@@ -559,14 +560,12 @@
+@@ -574,14 +575,12 @@
  void create_random_string(char *to, unsigned int length, struct rand_struct *rand_st);
  
  void hash_password(unsigned long *to, const char *password, unsigned int password_len);
@@ -103,7 +91,7 @@
 === modified file 'Percona-Server/libmysql/CMakeLists.txt'
 --- Percona-Server/libmysql/CMakeLists.txt	2013-04-15 06:52:16 +0000
 +++ Percona-Server/libmysql/CMakeLists.txt	2013-04-15 07:08:10 +0000
-@@ -221,7 +221,7 @@
+@@ -224,7 +224,7 @@
        SET(libmysql_link_flags
          "${libmysql_link_flags} ${LINK_FLAG_NO_UNDEFINED}")
        SET(libmysql_link_flags
@@ -113,15 +101,3 @@
          PROPERTIES LINK_FLAGS "${libmysql_link_flags}")
      ENDIF() 
 
-=== modified file 'Percona-Server/libmysql/errmsg.c'
---- Percona-Server/libmysql/errmsg.c	2013-04-15 06:52:16 +0000
-+++ Percona-Server/libmysql/errmsg.c	2013-04-15 07:08:10 +0000
-@@ -23,6 +23,7 @@
- #include <my_sys.h>
- #include "errmsg.h"
- 
-+const char **mysql_client_errors = client_errors;
- const char *client_errors[]=
- {
-   "Unknown MySQL error",
-