Merge lp:~vlad-lesin/percona-server/5.6-mysqlbinlog-issue35303 into lp:percona-server/5.6

[Vlad Lesin]

Bug #1197524 fixes and
https://blueprints.launchpad.net/percona-server/+spec/mysqlbinlog-compress
blueprint implementation.

SSL and compression connection options are implemented for mysqlbinlog.

http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/399

Merged from lp:~vlad-lesin/percona-server/5.5-mysqlbinlog-issue35303. The difference between 5.5 and 5.6 versions is in the following two lines:
+ mysql_options(mysql, MYSQL_OPT_SSL_CRL, opt_ssl_crl);
+ mysql_options(mysql, MYSQL_OPT_SSL_CRLPATH, opt_ssl_crlpath);
5.5 does not support these options while 5.6 does.

[George Ormond Lorch III (gl-az)]

review: Approve (g2)

[Laurynas Biveinis (laurynas-biveinis)]

Vlad -

This is OK but we have a Launchpad limitation that a blueprint can be targeted only to single series. https://blueprints.launchpad.net/percona-server/+spec/mysqlbinlog-compress is targeted to 5.5 and thus will be invisible in 5.6 milestone view etc. Please create a new blueprint for 5.6.

review: Needs Information

[Vlad Lesin (vlad-lesin)]

> This is OK but we have a Launchpad limitation that a blueprint can be targeted
> only to single series. https://blueprints.launchpad.net/percona-server/+spec
> /mysqlbinlog-compress is targeted to 5.5 and thus will be invisible in 5.6
> milestone view etc. Please create a new blueprint for 5.6.
Done. See https://blueprints.launchpad.net/percona-server/+spec/mysqlbinlog-compress-5.6 .

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'Percona-Server/client/mysqlbinlog.cc'
--- Percona-Server/client/mysqlbinlog.cc	2013-10-23 08:48:28 +0000
+++ Percona-Server/client/mysqlbinlog.cc	2013-11-04 09:10:20 +0000
@@ -67,6 +67,7 @@
 
 
 #define CLIENT_CAPABILITIES	(CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG | CLIENT_LOCAL_FILES)
+#include <sslopt-vars.h>
 
 char server_version[SERVER_VERSION_LENGTH];
 ulong server_id = 0;
@@ -379,7 +380,7 @@
                                   Create_file_log_event *ce);
 };
 
-
+static my_bool opt_compress=0;
 /**
   Creates and opens a new temporary file in the directory specified by previous call to init_by_dir_name() or init_by_cur_dir().
 
@@ -1395,6 +1396,9 @@
   {"character-sets-dir", OPT_CHARSETS_DIR,
    "Directory for character set files.", &charsets_dir,
    &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+  {"compress", 'C', "Use compression in server/client protocol.",
+   &opt_compress, &opt_compress, 0, GET_BOOL, NO_ARG, 0, 0, 0,
+   0, 0, 0},
   {"database", 'd', "List entries for just this database (local log only).",
    &database, &database, 0, GET_STR_ALLOC, REQUIRED_ARG,
    0, 0, 0, 0, 0, 0},
@@ -1499,6 +1503,7 @@
   {"socket", 'S', "The socket file to use for connection.",
    &sock, &sock, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0,
    0, 0},
+#include <sslopt-longopts.h>
   {"start-datetime", OPT_START_DATETIME,
    "Start reading the binlog at first event having a datetime equal or "
    "posterior to the argument; the argument must be a date and time "
@@ -1727,6 +1732,7 @@
     DBUG_PUSH(argument ? argument : default_dbug_option);
     break;
 #endif
+#include <sslopt-case.h>
   case 'd':
     one_database = 1;
     break;
@@ -1828,7 +1834,19 @@
 
   if (opt_default_auth && *opt_default_auth)
     mysql_options(mysql, MYSQL_DEFAULT_AUTH, opt_default_auth);
-
+  if (opt_compress)
+    mysql_options(mysql,MYSQL_OPT_COMPRESS,NullS);
+#ifdef HAVE_OPENSSL
+  if (opt_use_ssl)
+  {
+    mysql_ssl_set(mysql, opt_ssl_key, opt_ssl_cert, opt_ssl_ca,
+                  opt_ssl_capath, opt_ssl_cipher);
+    mysql_options(mysql, MYSQL_OPT_SSL_CRL, opt_ssl_crl);
+    mysql_options(mysql, MYSQL_OPT_SSL_CRLPATH, opt_ssl_crlpath);
+  }
+  mysql_options(mysql,MYSQL_OPT_SSL_VERIFY_SERVER_CERT,
+                (char*)&opt_ssl_verify_server_cert);
+#endif
   if (opt_protocol)
     mysql_options(mysql, MYSQL_OPT_PROTOCOL, (char*) &opt_protocol);
   if (opt_bind_addr)
 
=== added file 'Percona-Server/mysql-test/r/percona_mysqlbinlog_ssl_compress.result'
--- Percona-Server/mysql-test/r/percona_mysqlbinlog_ssl_compress.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_mysqlbinlog_ssl_compress.result	2013-11-04 09:10:20 +0000
@@ -0,0 +1,21 @@
+reset master;
+set timestamp=1000000000;
+drop table if exists t1;
+create table t1 (word varchar(20));
+insert into t1 values ("abirvalg");
+flush logs;
+
+--- --start-position --
+DELIMITER /*!*/;
+/*!\C latin1 *//*!*/;
+BEGIN
+/*!*/;
+use `test`/*!*/;
+insert into t1 values ("abirvalg")
+/*!*/;
+COMMIT
+/*!*/;
+DELIMITER ;
+# End of log file
+ROLLBACK /* added by mysqlbinlog */;
+drop table t1;
 
=== added file 'Percona-Server/mysql-test/t/percona_mysqlbinlog_ssl_compress.test'
--- Percona-Server/mysql-test/t/percona_mysqlbinlog_ssl_compress.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/t/percona_mysqlbinlog_ssl_compress.test	2013-11-04 09:10:20 +0000
@@ -0,0 +1,35 @@
+# Check for mysqlbinlog ssl and compression options
+-- source include/have_compress.inc
+-- source include/have_ssl_communication.inc
+-- source include/have_binlog_format_statement.inc
+-- source include/have_log_bin.inc
+
+--disable_query_log
+CALL mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
+--enable_query_log
+
+# Deletes all the binary logs
+reset master;
+
+# we need this for getting fixed timestamps inside of this test
+set timestamp=1000000000;
+
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+
+create table t1 (word varchar(20));
+
+--let $binlog_start_pos=query_get_value(SHOW MASTER STATUS, Position, 1)
+# simple test for simple statement and various events
+insert into t1 values ("abirvalg");
+flush logs;
+
+# Strangely but this works
+--disable_query_log
+select "--- --start-position --" as "";
+--enable_query_log
+--replace_regex /.*SET .*$//[i]
+--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --read-from-remote-server --start-position=$binlog_start_pos --user=root --host=127.0.0.1 --port=$MASTER_MYPORT --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem --compress master-bin.000001
+
+drop table t1;