Merge lp:~laurynas-biveinis/percona-server/bug1204871 into lp:percona-server/5.6

[Laurynas Biveinis]

No BT or ST but part of TokuDB QA.

Fix bug 1204871 (abort in ha_partition::end_bulk_insert |
sql/ha_partition.cc:4438: virtual int ha_partition::end_bulk_insert():
Assertion `0' failed. (sig6)) /
http://bugs.mysql.com/bug.php?id=71270.

A debug server build will crash if, while performing a bulk insert to
a partitioned table, one of the partitions will return a failure for
end_bulk_insert handler call.

The crash happens because the failing ha_partition::end_bulk_insert()
call will clear the m_bulk_insert_started bitmap before returning the
failure to the caller. The caller will handle the failure, and at one
point it will call select_insert::abort_result_set(), which will
attempt end_bulk_insert again, which will hit DBUG_ASSERT(0) because
m_bulk_insert_started is cleared.

Fix by resetting THD::bulk_insert_started_flag on end bulk insert
handler calls. Add an error-injecting testcase
parts/partition_bug71270.

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

[Vlad Lesin (vlad-lesin)]

review: Approve (g2)

=== added file 'Percona-Server/mysql-test/suite/parts/r/partition_bug71270.result'
--- Percona-Server/mysql-test/suite/parts/r/partition_bug71270.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/parts/r/partition_bug71270.result	2014-01-06 13:21:36 +0000
@@ -0,0 +1,8 @@
+SET debug="+d,ha_partition_end_bulk_insert_fail";
+CREATE TABLE t1 (id INT PRIMARY KEY) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1),(2),(3);
+CREATE TABLE t2 (id INT PRIMARY KEY) ENGINE=InnoDB PARTITION BY HASH (id) PARTITIONS 2;
+INSERT INTO t2 SELECT * FROM t1;
+ERROR HY000: Got error 1 from storage engine
+DROP TABLE t1, t2;
+SET debug=default;

=== added file 'Percona-Server/mysql-test/suite/parts/t/partition_bug71270.test'
--- Percona-Server/mysql-test/suite/parts/t/partition_bug71270.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/parts/t/partition_bug71270.test	2014-01-06 13:21:36 +0000
@@ -0,0 +1,21 @@
+#
+# Testcase for http://bugs.mysql.com/bug.php?id=71270
+# (Failures to end bulk insert for partitioned tables handled incorrectly)
+#
+--source include/have_debug.inc
+--source include/have_innodb.inc
+--source include/have_partition.inc
+
+SET debug="+d,ha_partition_end_bulk_insert_fail";
+
+CREATE TABLE t1 (id INT PRIMARY KEY) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1),(2),(3);
+
+CREATE TABLE t2 (id INT PRIMARY KEY) ENGINE=InnoDB PARTITION BY HASH (id) PARTITIONS 2;
+
+--error ER_GET_ERRNO
+INSERT INTO t2 SELECT * FROM t1;
+
+DROP TABLE t1, t2;
+
+SET debug=default;

=== modified file 'Percona-Server/sql/ha_partition.cc'
--- Percona-Server/sql/ha_partition.cc	2013-12-05 17:23:10 +0000
+++ Percona-Server/sql/ha_partition.cc	2014-01-06 13:21:36 +0000
@@ -4495,6 +4495,7 @@
       error= tmp;
   }
   bitmap_clear_all(&m_bulk_insert_started);
+  DBUG_EXECUTE_IF("ha_partition_end_bulk_insert_fail", error= 1;);
   DBUG_RETURN(error);
 }
 

=== modified file 'Percona-Server/sql/sql_class.h'
--- Percona-Server/sql/sql_class.h	2013-12-16 08:45:31 +0000
+++ Percona-Server/sql/sql_class.h	2014-01-06 13:21:36 +0000
@@ -4628,7 +4628,7 @@
    */
   List<Item> *fields;
 protected:
-  /// ha_start_bulk_insert has been called. Never cleared.
+  /// ha_start_bulk_insert has been called.
   bool bulk_insert_started;
 public:
   ulonglong autoinc_value_of_last_inserted_row; // autogenerated or not

=== modified file 'Percona-Server/sql/sql_insert.cc'
--- Percona-Server/sql/sql_insert.cc	2013-12-16 08:45:31 +0000
+++ Percona-Server/sql/sql_insert.cc	2014-01-06 13:21:36 +0000
@@ -3793,6 +3793,7 @@
 
   error= (bulk_insert_started ?
           table->file->ha_end_bulk_insert() : 0);
+  bulk_insert_started= false;
   if (!error && thd->is_error())
     error= thd->get_stmt_da()->sql_errno();
 
@@ -3884,8 +3885,10 @@
       if tables are not locked yet (bulk insert is not started yet
       in this case).
     */
-    if (bulk_insert_started)
+    if (bulk_insert_started) {
       table->file->ha_end_bulk_insert();
+      bulk_insert_started= false;
+    }
 
     /*
       If at least one row has been inserted/modified and will stay in