Merge lp:~percona-core/percona-server/release-5.6.10-60.2 into lp:percona-server/5.6

[Ignacio Nin]

Changes for release-5.6.10-60.2

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'Makefile'
--- Makefile	2012-12-04 08:24:59 +0000
+++ Makefile	2013-04-05 21:08:23 +0000
@@ -1,4 +1,4 @@
-MYSQL_VERSION=5.6.8
+MYSQL_VERSION=5.6.10
 PERCONA_SERVER_VERSION=alpha60.2
 PERCONA_SERVER         ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)
 PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)
 
=== modified file 'build/debian/control'
--- build/debian/control	2012-08-10 20:27:09 +0000
+++ build/debian/control	2013-04-05 21:08:23 +0000
@@ -76,7 +76,7 @@
 
 Package: percona-server-client-5.6
 Architecture: any
-Depends: debianutils (>=1.6), libdbi-perl, percona-server-common-5.6 (>= ${source:Version}), libmysqlclient18 (>= ${source:Version}), ${shlib:Depends}, ${misc:Depends}
+Depends: debianutils (>=1.6), libdbi-perl, percona-server-common-5.6 (>= ${source:Version}), libmysqlclient18, ${shlib:Depends}, ${misc:Depends}
 Provides: mysql-client, virtual-mysql-client
 Conflicts: mysql-client (<< ${source:Version}), mysql-client-5.0, mysql-client-5.1, mysql-client-core-5.1, percona-xtradb-client-5.0, percona-server-client-5.1, percona-server-client-5.5
 Replaces: mysql-client (<< ${source:Version}), mysql-client-5.0, mysql-client-5.1, mysql-client-core-5.1, percona-xtradb-client-5.0, percona-server-client-5.1, percona-server-client-5.5
 
=== removed file 'build/debian/docs'
--- build/debian/docs	2013-03-05 12:46:43 +0000
+++ build/debian/docs	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-CMakeLists.txt
-README
 
=== modified file 'build/debian/libmysqlclient18.docs'
--- build/debian/libmysqlclient18.docs	2013-03-05 12:46:43 +0000
+++ build/debian/libmysqlclient18.docs	2013-04-05 21:08:23 +0000
@@ -0,0 +1,2 @@
+CMakeLists.txt
+README
 
=== renamed file 'build/debian/info' => 'build/debian/libmysqlclient18.info'
=== modified file 'build/debian/patches/30_scripts__mysqld_safe.sh__signals.dpatch'
--- build/debian/patches/30_scripts__mysqld_safe.sh__signals.dpatch	2013-03-05 12:46:43 +0000
+++ build/debian/patches/30_scripts__mysqld_safe.sh__signals.dpatch	2013-04-05 21:08:23 +0000
@@ -4,14 +4,9 @@
 ## DP: 30_scripts__mysqld_safe.sh__signals.patch by  <[e-mail]>
 
 @DPATCH@
-
-30_scripts__mysqld_safe.sh__signals.patch by  <[e-mail]>
-
-Executes /etc/init.d/mysql on signals
-Reported as http://bugs.mysql.com/bug.php?id=31361
-
---- a/scripts/mysqld_safe.sh
-+++ b/scripts/mysqld_safe.sh
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' Percona-Server~/scripts/mysqld_safe.sh Percona-Server/scripts/mysqld_safe.sh
+--- Percona-Server~/scripts/mysqld_safe.sh	2013-03-04 08:26:59.000000000 -0500
++++ Percona-Server/scripts/mysqld_safe.sh	2013-03-04 08:27:48.000000000 -0500
 @@ -29,9 +29,6 @@
  syslog_tag_mysqld=mysqld
  syslog_tag_mysqld_safe=mysqld_safe
@@ -19,10 +14,10 @@
 -trap '' 1 2 3 15			# we shouldn't let anyone kill us
 -trap '' 13                              # not even SIGPIPE
 -
- umask 007
- 
- defaults=
-@@ -712,6 +709,12 @@
+ # MySQL-specific environment variable. First off, it's not really a umask,
+ # it's the desired mode. Second, it follows umask(2), not umask(3) in that
+ # octal needs to be explicit. Our shell might be a proper sh without printf,
+@@ -739,6 +736,12 @@
    fi
  fi
  
 
=== modified file 'build/debian/percona-server-server-5.6.install'
--- build/debian/percona-server-server-5.6.install	2013-03-05 12:46:43 +0000
+++ build/debian/percona-server-server-5.6.install	2013-04-05 21:08:23 +0000
@@ -22,7 +22,6 @@
 usr/bin/replace
 usr/bin/resolve_stack_dump
 usr/bin/resolveip
-usr/bin/innodb_memcached_config.sql
 usr/sbin/mysqld
 usr/share/man/man1/msql2mysql.1
 usr/share/man/man1/myisamchk.1
 
=== modified file 'build/debian/percona-server-server-5.6.postinst'
--- build/debian/percona-server-server-5.6.postinst	2013-03-05 12:46:43 +0000
+++ build/debian/percona-server-server-5.6.postinst	2013-04-05 21:08:23 +0000
@@ -139,7 +139,7 @@
     # Debian: beware of the bashisms... 
     # Debian: can safely run on upgrades with existing databases 
     set +e
-    /bin/bash ${PERCONA_PREFIX}/bin/mysql_install_db --user=mysql --rpm 2>&1 |
+    ${PERCONA_PREFIX}/bin/mysql_install_db --user=mysql --rpm 2>&1 |
         $ERR_LOGGER
     if [ "$?" != "0" ]; then
       echo "ATTENTION: An error has occured. More info is in the syslog!"
@@ -193,7 +193,7 @@
         "USE mysql\n" \
         "ALTER TABLE user CHANGE Password Password char(41) character set latin1 collate latin1_bin DEFAULT '' NOT NULL"`;
     replace_query=`/bin/echo -e \
-        "USE mysql\n" \
+        "USE mysql;\n" \
         "REPLACE INTO user SET " \
         "  host='localhost', user='debian-sys-maint', password=password('$pass'), " \
         "  Select_priv='Y', Insert_priv='Y', Update_priv='Y', Delete_priv='Y', " \
@@ -203,7 +203,8 @@
         "  Create_tmp_table_priv='Y', Lock_tables_priv='Y', Execute_priv='Y', "\
         "  Repl_slave_priv='Y', Repl_client_priv='Y', Create_view_priv='Y', "\
         "  Show_view_priv='Y', Create_routine_priv='Y', Alter_routine_priv='Y', "\
-        "  Create_user_priv='Y', Event_priv='Y', Trigger_priv='Y' "`;
+        "  Create_user_priv='Y', Event_priv='Y', Trigger_priv='Y', "\
+        "  ssl_cipher='', x509_issuer='', x509_subject=''; "`
     fix_privs=`/bin/echo -e \
         "USE mysql;\n" \
         "ALTER TABLE user ADD column Create_view_priv enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N'; " \
@@ -213,32 +214,13 @@
         "ALTER TABLE user ADD column Create_user_priv enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N'; " \
         "ALTER TABLE user ADD column Event_priv enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N'; " \
         "ALTER TABLE user ADD column Trigger_priv enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N'; " `
-    # Engines supported by etch should be installed per default. The query sequence is supposed
-    # to be aborted if the CREATE TABLE fails due to an already existent table in which case the
-    # admin might already have chosen to remove one or more plugins. Newlines are necessary.
-    install_plugins=`/bin/echo -e \
-        "USE mysql;\n" \
-        "CREATE TABLE plugin (name char(64) COLLATE utf8_bin NOT NULL DEFAULT '', " \
-        "  dl char(128) COLLATE utf8_bin NOT NULL DEFAULT '', " \
-        "  PRIMARY KEY (name)) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='MySQL plugins';\n" \
-        "INSERT INTO plugin VALUES ('innodb',    'ha_innodb.so');\n" \
-        "INSERT INTO plugin VALUES ('federated', 'ha_federated.so');\n" \
-        "INSERT INTO plugin VALUES ('blackhole', 'ha_blackhole.so');\n" \
-        "INSERT INTO plugin VALUES ('archive',   'ha_archive.so');" `
-
-    # Upgrade password column format before the root password gets set.
-    echo "$password_column_fix_query"                        | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER
 
     db_get percona-server-server/root_password && rootpw="$RET"
     if ! set_mysql_rootpw; then
         password_error="yes"
     fi
 
-    echo "$fix_privs"                                        | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER
     echo "$replace_query"                                    | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER
-    set +e
-    echo "$install_plugins"                                  | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER
-    set -e
   ;;
 
   abort-upgrade|abort-remove|abort-configure)
 
=== modified file 'build/debian/rules'
--- build/debian/rules	2012-08-23 18:32:26 +0000
+++ build/debian/rules	2013-04-05 21:08:23 +0000
@@ -8,7 +8,7 @@
 TMP=$(CURDIR)/debian/tmp/
 
 feature_set="community"
-compilation_comment_release="Percona Server (GPL), Release 60.1"
+compilation_comment_release="Percona Server (GPL), Release 60.2"
 server_suffix="-56"
 prefix="/usr"
 
 
=== modified file 'build/percona-server.spec'
--- build/percona-server.spec	2012-08-28 19:20:25 +0000
+++ build/percona-server.spec	2013-04-05 21:08:23 +0000
@@ -25,10 +25,10 @@
 %define mysql_vendor            Oracle and/or its affiliates
 %define percona_server_vendor	Percona, Inc
 
-%define mysql_version   5.6.6
+%define mysql_version   5.6.10
 %define redhatversion %(lsb_release -rs | awk -F. '{ print $1}')
 %define majorversion 60
-%define minorversion 1
+%define minorversion 2
 %define distribution  rhel%{redhatversion}
 %define percona_server_version	alpha%{majorversion}.%{minorversion}
 
@@ -998,7 +998,6 @@
 %attr(755, root, root) %{_sbindir}/mysqld
 %attr(755, root, root) %{_sbindir}/mysqld-debug
 %attr(755, root, root) %{_sbindir}/rcmysql
-%attr(755, root, root) %{_bindir}/innodb_memcached_config.sql
 %attr(755, root, root) %{_libdir}/mysql/plugin/daemon_example.ini
 %attr(755, root, root) %{_libdir}/mysql/plugin/adt_null.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/libdaemon_example.so