Merge lp:~vlad-lesin/percona-server/bugs-1008609-1008278 into lp:percona-server/5.5

[Vlad Lesin]

Fix for bugs 1008609 and 1008278. Jenkins build: http://jenkins.percona.com/view/PS%205.5/job/percona-server-5.5-param/424 .

[Alexey Kopytov (akopytov)]

Vlad,

Please recommit and provide more descriptive revision comments, mentioning all three bug numbers, and the problem description. Here's an example of a good revision comment: http://bazaar.launchpad.net/~laurynas-biveinis/percona-server/bug951588-5.1/revision/447

It would also be great to have a replication test to verify bug #1008278 is indeed fixed by this patch. It's not clear why only Master-Master replication was affected, could it be that SQL thread always crashes with userstat enabled? In both cases a test case should be rather trivial.

review: Needs Fixing

[Vlad Lesin (vlad-lesin)]

> Vlad,
>
> Please recommit and provide more descriptive revision comments, mentioning all
> three bug numbers, and the problem description. Here's an example of a good
> revision comment: http://bazaar.launchpad.net/~laurynas-biveinis/percona-
> server/bug951588-5.1/revision/447
>
> It would also be great to have a replication test to verify bug #1008278 is
> indeed fixed by this patch. It's not clear why only Master-Master replication
> was affected, could it be that SQL thread always crashes with userstat
> enabled? In both cases a test case should be rather trivial.

Done.

[Alexey Kopytov (akopytov)]

review: Approve

=== added file 'Percona-Server/mysql-test/r/percona_bug1008278.result'
--- Percona-Server/mysql-test/r/percona_bug1008278.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_bug1008278.result	2012-06-14 14:34:30 +0000
@@ -0,0 +1,8 @@
+include/master-slave.inc
+[connection master]
+DROP TABLE IF EXISTS t;
+CREATE TABLE t(id INT,data CHAR(30));
+INSERT INTO t VALUES
+(1,"aaaaabbbbbcccccdddddeeeeefffff");
+DROP TABLE t;
+include/rpl_end.inc

=== added file 'Percona-Server/mysql-test/r/percona_bug1008609.result'
--- Percona-Server/mysql-test/r/percona_bug1008609.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_bug1008609.result	2012-06-14 14:34:30 +0000
@@ -0,0 +1,1 @@
+OK

=== added file 'Percona-Server/mysql-test/t/percona_bug1008278-slave.opt'
--- Percona-Server/mysql-test/t/percona_bug1008278-slave.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/t/percona_bug1008278-slave.opt	2012-06-14 14:34:30 +0000
@@ -0,0 +1,1 @@
+--userstat=1

=== added file 'Percona-Server/mysql-test/t/percona_bug1008278.test'
--- Percona-Server/mysql-test/t/percona_bug1008278.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/t/percona_bug1008278.test	2012-06-14 14:34:30 +0000
@@ -0,0 +1,23 @@
+# Bug 1008278: The server crashes when replication is started
+# with "--userstat=1" parameter.
+# Just start replcation with "--userstat=1" parameter and execute any
+# query on master to be ensure slave doesn't crash. 
+
+--source include/have_binlog_format_statement.inc
+--source include/master-slave.inc
+
+connection master;
+-- disable_warnings
+DROP TABLE IF EXISTS t;
+-- enable_warnings
+
+CREATE TABLE t(id INT,data CHAR(30));
+INSERT INTO t VALUES
+(1,"aaaaabbbbbcccccdddddeeeeefffff");
+sync_slave_with_master;
+
+connection master;
+DROP TABLE t;
+sync_slave_with_master;
+
+--source include/rpl_end.inc

=== added file 'Percona-Server/mysql-test/t/percona_bug1008609.test'
--- Percona-Server/mysql-test/t/percona_bug1008609.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/t/percona_bug1008609.test	2012-06-14 14:34:30 +0000
@@ -0,0 +1,24 @@
+# The bug #1008609 test cause. 
+# The bug consist in crashing the server when it is launched with both
+# "--userstat=1" and "--bootstrap" parameters.
+#
+# Just start with --userstat=1 --bootstrap. If the server doesn't crash the
+# test is passed.
+
+let $MYSQLD_BOOTSTRAP_CMD= $MYSQLD_BOOTSTRAP_CMD
+  --default-storage-engine=MyISAM
+  --skip-innodb
+  --userstat=on;
+
+--write_file $MYSQLTEST_VARDIR/tmp/percona_bug1008609.sql
+SELECT 1;
+EOF
+
+exec
+  $MYSQLD_BOOTSTRAP_CMD < $MYSQLTEST_VARDIR/tmp/percona_bug1008609.sql >> 
+    $MYSQLTEST_VARDIR/tmp/percona_bug1008609.log 2>&1;
+
+--remove_file $MYSQLTEST_VARDIR/tmp/percona_bug1008609.sql
+--remove_file $MYSQLTEST_VARDIR/tmp/percona_bug1008609.log
+
+--echo OK

=== modified file 'Percona-Server/sql/sql_connect.cc'
--- Percona-Server/sql/sql_connect.cc	2012-05-18 04:36:35 +0000
+++ Percona-Server/sql/sql_connect.cc	2012-06-14 14:34:30 +0000
@@ -499,7 +499,7 @@
     }
   }
   user_stats->total_connections++;
-  if (thd->net.vio->type == VIO_TYPE_SSL)
+  if (thd->net.vio &&  thd->net.vio->type == VIO_TYPE_SSL)
     user_stats->total_ssl_connections++;
   return 0;
 }
@@ -539,7 +539,7 @@
     }
   }
   thread_stats->total_connections++;
-  if (thd->net.vio->type == VIO_TYPE_SSL)
+  if (thd->net.vio && thd->net.vio->type == VIO_TYPE_SSL)
     thread_stats->total_ssl_connections++;
   return 0;
 }