Merge lp:~percona-core/percona-server/release-5.6.13-61.0 into lp:percona-server/5.6

[Ignacio Nin]

Changes for release 5.6.13-61.0

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'Makefile'
--- Makefile	2013-09-20 12:23:50 +0000
+++ Makefile	2013-10-09 23:00:51 +0000
@@ -1,5 +1,5 @@
 MYSQL_VERSION=5.6.13
-PERCONA_SERVER_VERSION=rc60.6
+PERCONA_SERVER_VERSION=rel61.0
 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/scripts/mysql_install_db.pl.in'
--- Percona-Server/scripts/mysql_install_db.pl.in	2013-02-28 13:32:03 +0000
+++ Percona-Server/scripts/mysql_install_db.pl.in	2013-10-09 23:00:51 +0000
@@ -421,6 +421,7 @@
 -x $print_defaults or -f "$print_defaults.exe"
   or cannot_find_file($print_defaults);
 
+<<'CONFIGFILE_BUG1225189';
 my $config_file;
 my $copy_cfg_file;
 
@@ -457,6 +458,7 @@
   $failed_write_cfg= 1;
 }
 close TEMPL;
+CONFIGFILE_BUG1225189
 
 # ----------------------------------------------------------------------
 # Now we can get arguments from the groups [mysqld] and [mysql_install_db]
@@ -466,15 +468,15 @@
 my $print_def_file;
 if ( $opt->{'defaults-file'} )
 {
-  $print_def_file= $opt->{'defaults-file'};
+  $print_def_file= "--defaults-file=$opt->{'defaults-file'}";
 }
 else
 {
-  $print_def_file= $config_file;
+  $print_def_file= "";
 }
 
 my @default_options;
-my $cmd = quote_options($print_defaults,"--defaults-file=$print_def_file",
+my $cmd = quote_options($print_defaults, $print_def_file,
                         "mysqld","mysql_install_db");
 open(PIPE, "$cmd |") or error($opt,"can't run $cmd: $!");
 while ( <PIPE> )
@@ -846,6 +848,7 @@
            "",
            "Support MySQL by buying support/licenses at http://shop.mysql.com");
 
+<<'CONFIGFILE_BUG1225189';
     if ($copy_cfg_file eq $config_file and !$failed_write_cfg)
     {
       report($opt,
@@ -871,6 +874,7 @@
 	      "The new default config file was created as $copy_cfg_file,",
 	      "please compare it with your file and take the changes you need.");
     }
+CONFIGFILE_BUG1225189
     foreach my $cfg ( "/etc/my.cnf", "/etc/mysql/my.cnf" )
     {
       check_sys_cfg_file ($opt, $cfg);
 
=== modified file 'build/debian/rules'
--- build/debian/rules	2013-10-01 10:47:37 +0000
+++ build/debian/rules	2013-10-09 23:00:51 +0000
@@ -8,8 +8,8 @@
 TMP=$(CURDIR)/debian/tmp/
 
 feature_set="community"
-major_version=60
-minor_version=6
+major_version=61
+minor_version=0
 compilation_comment_release="Percona Server (GPL), Release $(major_version).$(minor_version)"
 server_suffix="-rc$(major_version).$(minor_version)"
 prefix="/usr"
 
=== modified file 'build/percona-server.spec'
--- build/percona-server.spec	2013-10-09 23:00:50 +0000
+++ build/percona-server.spec	2013-10-09 23:00:51 +0000
@@ -27,16 +27,16 @@
 
 %define mysql_version   5.6.13
 %define redhatversion %(lsb_release -rs | awk -F. '{ print $1}')
-%define majorversion 60
-%define minorversion 6
+%define majorversion 61
+%define minorversion 0
 %define distribution  rhel%{redhatversion}
-%define percona_server_version	rc%{majorversion}.%{minorversion}
+%define percona_server_version	rel%{majorversion}.%{minorversion}
 
 %define mysqld_user     mysql
 %define mysqld_group    mysql
 %define mysqldatadir    /var/lib/mysql
 
-%define release         rc%{majorversion}.%{minorversion}.%{gotrevision}.%{distribution}
+%define release         rel%{majorversion}.%{minorversion}.%{gotrevision}.%{distribution}
 
 #
 # Macros we use which are not available in all supported versions of RPM