Merge lp:~laurynas-biveinis/percona-server/fake-changes-binlog-5.6 into lp:percona-server/5.6

[Laurynas Biveinis]

2nd MP:

http://jenkins.percona.com/job/percona-server-5.6-param/229/

1st MP:

No BT or ST, but prerequisite for BT 20439, as well as being quite critical bug for the fake changes feature.

Manually merge bug 1190580 and bug 1188162 fixes from 5.5.

http://jenkins.percona.com/job/percona-server-5.6-param/154/

[Vlad Lesin (vlad-lesin)]

review: Approve (g2)

[Alexey Kopytov (akopytov)]

Same comments as in 5.1.

review: Needs Fixing

[Alexey Kopytov (akopytov)]

review: Approve

=== added file 'Percona-Server/mysql-test/suite/binlog/r/binlog_percona_fake_changes.result'
--- Percona-Server/mysql-test/suite/binlog/r/binlog_percona_fake_changes.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/binlog/r/binlog_percona_fake_changes.result	2013-08-23 05:57:23 +0000
@@ -0,0 +1,71 @@
+DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t2;
+DROP TABLE IF EXISTS t3;
+CREATE TABLE t1 (a INT PRIMARY KEY, b int) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1,1);
+CREATE TABLE t2 (a INT PRIMARY KEY, b int) ENGINE=InnoDB;
+CREATE INDEX bx ON t2(b);
+INSERT INTO t2 VALUES (1,1);
+CREATE TABLE t3 (a INT PRIMARY KEY, b text) ENGINE=InnoDB;
+INSERT INTO t3 VALUES (1,'');
+RESET MASTER;
+SET innodb_fake_changes=1;
+SELECT * FROM t1;
+ERROR HY000: Got error 131 during COMMIT
+SELECT * FROM t2;
+ERROR HY000: Got error 131 during COMMIT
+SELECT * FROM t3;
+ERROR HY000: Got error 131 during COMMIT
+INSERT INTO t1 VALUES (2,2);
+ERROR HY000: Got error 131 during COMMIT
+INSERT INTO t2 VALUES (2,2);
+ERROR HY000: Got error 131 during COMMIT
+INSERT INTO t3 VALUES (2,lpad('a',10000, 'b'));
+ERROR HY000: Got error 131 during COMMIT
+UPDATE t1 SET a=0 where b=1;
+ERROR HY000: Got error 131 during COMMIT
+UPDATE t2 SET a=0 where b=1;
+ERROR HY000: Got error 131 during COMMIT
+UPDATE t3 SET a=0 where a=1;
+ERROR HY000: Got error 131 during COMMIT
+UPDATE t1 SET b=0 where a=1;
+ERROR HY000: Got error 131 during COMMIT
+UPDATE t2 SET b=0 where a=1;
+ERROR HY000: Got error 131 during COMMIT
+UPDATE t2 SET b=lpad('a',10000, 'z') where a=1;
+ERROR HY000: Got error 131 during COMMIT
+UPDATE t1 SET b=0 where a=2;
+ERROR HY000: Got error 131 during COMMIT
+UPDATE t2 SET b=0 where a=2;
+ERROR HY000: Got error 131 during COMMIT
+UPDATE t2 SET b=lpad('a',10000, 'z') where a=2;
+ERROR HY000: Got error 131 during COMMIT
+DELETE FROM t1 where b=2;
+ERROR HY000: Got error 131 during COMMIT
+DELETE FROM t2 where b=2;
+ERROR HY000: Got error 131 during COMMIT
+DELETE FROM t1 where a=2;
+ERROR HY000: Got error 131 during COMMIT
+DELETE FROM t2 where a=2;
+ERROR HY000: Got error 131 during COMMIT
+DELETE FROM t3 where a=2;
+ERROR HY000: Got error 131 during COMMIT
+REPLACE INTO t1 values (2,3);
+ERROR HY000: Got error 131 during COMMIT
+REPLACE INTO t2 values (2,3);
+ERROR HY000: Got error 131 during COMMIT
+REPLACE INTO t3 values (2,lpad('a',9000,'q'));
+ERROR HY000: Got error 131 during COMMIT
+INSERT INTO t1 VALUES (1,1) ON DUPLICATE KEY UPDATE b=2;
+ERROR HY000: Got error 131 during COMMIT
+INSERT INTO t2 VALUES (1,1) ON DUPLICATE KEY UPDATE b=2;
+ERROR HY000: Got error 131 during COMMIT
+INSERT INTO t3 VALUES (1,1) ON DUPLICATE KEY UPDATE b=lpad('b',11000,'c');
+ERROR HY000: Got error 131 during COMMIT
+include/show_binlog_events.inc
+must_be_1
+1
+SET innodb_fake_changes=default;
+DROP TABLE t1;
+DROP TABLE t2;
+DROP TABLE t3;

=== added file 'Percona-Server/mysql-test/suite/binlog/t/binlog_percona_fake_changes.test'
--- Percona-Server/mysql-test/suite/binlog/t/binlog_percona_fake_changes.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/binlog/t/binlog_percona_fake_changes.test	2013-08-23 05:57:23 +0000
@@ -0,0 +1,106 @@
+#
+# Test that fake changes are not written to binlog
+# Based on rpl_percona_fake_changes.test in Facebook patch
+# https://bugs.launchpad.net/percona-server/+bug/1190580
+# https://bugs.launchpad.net/percona-server/+bug/1188162
+#
+
+--source include/have_log_bin.inc
+--source include/have_innodb.inc
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t2;
+DROP TABLE IF EXISTS t3;
+--enable_warnings
+
+CREATE TABLE t1 (a INT PRIMARY KEY, b int) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1,1);
+
+CREATE TABLE t2 (a INT PRIMARY KEY, b int) ENGINE=InnoDB;
+CREATE INDEX bx ON t2(b);
+INSERT INTO t2 VALUES (1,1);
+
+CREATE TABLE t3 (a INT PRIMARY KEY, b text) ENGINE=InnoDB;
+INSERT INTO t3 VALUES (1,'');
+
+RESET MASTER;
+
+let $binlog_pos_1= query_get_value("SHOW MASTER STATUS", Position, 1);
+
+SET innodb_fake_changes=1;
+
+--error ER_ERROR_DURING_COMMIT
+SELECT * FROM t1;
+--error ER_ERROR_DURING_COMMIT
+SELECT * FROM t2;
+--error ER_ERROR_DURING_COMMIT
+SELECT * FROM t3;
+
+--error ER_ERROR_DURING_COMMIT
+INSERT INTO t1 VALUES (2,2);
+--error ER_ERROR_DURING_COMMIT
+INSERT INTO t2 VALUES (2,2);
+--error ER_ERROR_DURING_COMMIT
+INSERT INTO t3 VALUES (2,lpad('a',10000, 'b'));
+
+--error ER_ERROR_DURING_COMMIT
+UPDATE t1 SET a=0 where b=1;
+--error ER_ERROR_DURING_COMMIT
+UPDATE t2 SET a=0 where b=1;
+--error ER_ERROR_DURING_COMMIT
+UPDATE t3 SET a=0 where a=1;
+
+--error ER_ERROR_DURING_COMMIT
+UPDATE t1 SET b=0 where a=1;
+--error ER_ERROR_DURING_COMMIT
+UPDATE t2 SET b=0 where a=1;
+--error ER_ERROR_DURING_COMMIT
+UPDATE t2 SET b=lpad('a',10000, 'z') where a=1;
+
+--error ER_ERROR_DURING_COMMIT
+UPDATE t1 SET b=0 where a=2;
+--error ER_ERROR_DURING_COMMIT
+UPDATE t2 SET b=0 where a=2;
+--error ER_ERROR_DURING_COMMIT
+UPDATE t2 SET b=lpad('a',10000, 'z') where a=2;
+
+--error ER_ERROR_DURING_COMMIT
+DELETE FROM t1 where b=2;
+--error ER_ERROR_DURING_COMMIT
+DELETE FROM t2 where b=2;
+
+--error ER_ERROR_DURING_COMMIT
+DELETE FROM t1 where a=2;
+--error ER_ERROR_DURING_COMMIT
+DELETE FROM t2 where a=2;
+--error ER_ERROR_DURING_COMMIT
+DELETE FROM t3 where a=2;
+
+--error ER_ERROR_DURING_COMMIT
+REPLACE INTO t1 values (2,3);
+--error ER_ERROR_DURING_COMMIT
+REPLACE INTO t2 values (2,3);
+--error ER_ERROR_DURING_COMMIT
+REPLACE INTO t3 values (2,lpad('a',9000,'q'));
+
+--error ER_ERROR_DURING_COMMIT
+INSERT INTO t1 VALUES (1,1) ON DUPLICATE KEY UPDATE b=2;
+--error ER_ERROR_DURING_COMMIT
+INSERT INTO t2 VALUES (1,1) ON DUPLICATE KEY UPDATE b=2;
+--error ER_ERROR_DURING_COMMIT
+INSERT INTO t3 VALUES (1,1) ON DUPLICATE KEY UPDATE b=lpad('b',11000,'c');
+
+--source include/show_binlog_events.inc
+
+let $binlog_pos_2= query_get_value("SHOW MASTER STATUS", Position, 1);
+
+--disable_query_log
+eval SELECT $binlog_pos_1 = $binlog_pos_2 as must_be_1;
+--enable_query_log
+
+SET innodb_fake_changes=default;
+
+DROP TABLE t1;
+DROP TABLE t2;
+DROP TABLE t3;

=== modified file 'Percona-Server/sql/handler.cc'
--- Percona-Server/sql/handler.cc	2013-08-14 03:57:21 +0000
+++ Percona-Server/sql/handler.cc	2013-08-23 05:57:23 +0000
@@ -1298,6 +1298,18 @@
   {
     if (ha_info->is_trx_read_write())
       ++rw_ha_count;
+    else
+    {
+      /*
+        If we have any fake changes handlertons, they will not be marked as
+        read-write, potentially skipping 2PC and causing the fake transaction
+        to be binlogged.  Force using 2PC in this case by bumping rw_ha_count
+        for each fake changes handlerton.
+       */
+      handlerton *ht= ha_info->ht();
+      if (unlikely(ht->is_fake_change && ht->is_fake_change(ht, thd)))
+        ++rw_ha_count;
+    }
 
     if (! all)
     {
@@ -2079,7 +2091,14 @@
         transaction is read-only. This allows for simpler
         implementation in engines that are always read-only.
       */
-      if (!ha_info->is_trx_read_write())
+      /*
+        But do call two-phase commit if the handlerton has fake changes
+        enabled even if it's not marked as read-write.  This will ensure that
+        the fake changes handlerton prepare will fail, preventing binlogging
+        and committing the transaction in other engines.
+      */
+      if (!ha_info->is_trx_read_write()
+          && !(ht->is_fake_change && ht->is_fake_change(ht, thd)))
         continue;
       if ((err= ht->prepare(ht, thd, all)))
       {

=== modified file 'Percona-Server/sql/handler.h'
--- Percona-Server/sql/handler.h	2013-08-06 15:16:34 +0000
+++ Percona-Server/sql/handler.h	2013-08-23 05:57:23 +0000
@@ -894,6 +894,7 @@
    my_bool (*purge_changed_page_bitmaps)(ulonglong lsn);
    bool (*purge_archive_logs)(handlerton *hton, time_t before_date,
                              const char* to_filename);
+   my_bool (*is_fake_change)(handlerton *hton, THD *thd);
 
    uint32 flags;                                /* global handler flags */
    /*

=== modified file 'Percona-Server/storage/innobase/handler/ha_innodb.cc'
--- Percona-Server/storage/innobase/handler/ha_innodb.cc	2013-08-14 03:57:21 +0000
+++ Percona-Server/storage/innobase/handler/ha_innodb.cc	2013-08-23 05:57:23 +0000
@@ -522,6 +522,19 @@
 /*================================*/
 	ulonglong lsn);	/*!< in: LSN to purge files up to */
 
+
+/*****************************************************************//**
+Check whether this is a fake change transaction.
+@return TRUE if a fake change transaction */
+static
+my_bool
+innobase_is_fake_change(
+/*====================*/
+	handlerton	*hton,  /*!< in: InnoDB handlerton */
+	THD*		thd);	/*!< in: MySQL thread handle of the user for
+				  whom the transaction is being committed */
+
+
 static const char innobase_hton_name[]= "InnoDB";
 
 static MYSQL_THDVAR_BOOL(support_xa, PLUGIN_VAR_OPCMDARG,
@@ -2997,6 +3010,7 @@
 		= innobase_flush_changed_page_bitmaps;
 	innobase_hton->purge_changed_page_bitmaps
 		= innobase_purge_changed_page_bitmaps;
+	innobase_hton->is_fake_change = innobase_is_fake_change;
 
 	ut_a(DATA_MYSQL_TRUE_VARCHAR == (ulint)MYSQL_TYPE_VARCHAR);
 
@@ -3654,6 +3668,22 @@
 }
 
 /*****************************************************************//**
+Check whether this is a fake change transaction.
+@return TRUE if a fake change transaction */
+static
+my_bool
+innobase_is_fake_change(
+/*====================*/
+	handlerton	*hton __attribute__((unused)),
+				/*!< in: InnoDB handlerton */
+	THD*		thd)	/*!< in: MySQL thread handle of the user for
+				whom the transaction is being committed */
+{
+	trx_t*	trx = check_trx_exists(thd);
+	return trx->fake_changes;
+}
+
+/*****************************************************************//**
 Commits a transaction in an InnoDB database. */
 static
 void
@@ -13939,7 +13969,15 @@
 		return(0);
 	}
 
-	if (trx->fake_changes) {
+	if (UNIV_UNLIKELY(trx->fake_changes)) {
+
+		if (prepare_trx
+		    || (!thd_test_options(thd, OPTION_NOT_AUTOCOMMIT
+					  | OPTION_BEGIN))) {
+
+			thd->get_stmt_da()->reset_diagnostics_area();
+			return(HA_ERR_WRONG_COMMAND);
+		}
 		return(0);
 	}