Merge lp:~akopytov/percona-xtradb-cluster/bug1366997-5.5 into lp:percona-xtradb-cluster/5.5

[Alexey Kopytov]

=== modified file 'sql/wsrep_hton.cc'
--- sql/wsrep_hton.cc	2014-04-20 17:19:52 +0000
+++ sql/wsrep_hton.cc	2015-01-15 18:33:08 +0000
@@ -485,7 +485,7 @@
   case WSREP_BF_ABORT:
     DBUG_ASSERT(thd->wsrep_trx_meta.gtid.seqno != WSREP_SEQNO_UNDEFINED);
   case WSREP_TRX_FAIL:
-    WSREP_DEBUG("commit failed for reason: %d", rcode);
+    WSREP_DEBUG("commit failed for reason: %d %lu %s", rcode, thd->thread_id, thd->query());
     DBUG_PRINT("wsrep", ("replicating commit fail"));
 
     thd->wsrep_query_state= QUERY_EXEC;

=== modified file 'storage/innobase/handler/ha_innodb.cc'
--- storage/innobase/handler/ha_innodb.cc	2015-01-04 16:27:17 +0000
+++ storage/innobase/handler/ha_innodb.cc	2015-01-15 18:33:08 +0000
@@ -6711,6 +6711,14 @@
 #ifdef WITH_WSREP
 			/* workaround for LP bug #355000, retrying the insert */
 			case SQLCOM_INSERT:
+
+				WSREP_DEBUG("DUPKEY error for autoinc\n"
+				      "THD %ld, value %llu, off %llu inc %llu",
+				      wsrep_thd_thread_id(current_thd),
+				      auto_inc,
+				      prebuilt->autoinc_offset,
+				      prebuilt->autoinc_increment);
+
 				if (wsrep_on(current_thd)          &&
 				    auto_inc_inserted              &&
 				    wsrep_drupal_282555_workaround &&
@@ -8280,10 +8288,10 @@
 	DBUG_ENTER("wsrep_append_key");
 	bool const copy = true;
 #ifdef WSREP_DEBUG_PRINT
-	fprintf(stderr, "%s conn %ld, trx %llu, keylen %d, table %s ",
+	fprintf(stderr, "%s conn %ld, trx %llu, keylen %d, table %s\n SQL: %s ",
 		(shared) ? "Shared" : "Exclusive",
 		wsrep_thd_thread_id(thd), trx->id, key_len,
-		table_share->table_name.str);
+		table_share->table_name.str, wsrep_thd_query(thd));
 	for (int i=0; i<key_len; i++) {
 		fprintf(stderr, "%hhX, ", key[i]);
 	}
@@ -12396,7 +12404,20 @@
 		next value in the series. */
 		if (prebuilt->autoinc_increment > increment) {
 
+#ifdef WITH_WSREP
+			WSREP_DEBUG("autoinc decrease: %llu -> %llu\n"
+				    "THD: %ld, current: %llu, autoinc: %llu", 
+				    prebuilt->autoinc_increment,
+				    increment,
+				    wsrep_thd_thread_id(ha_thd()),
+				    current, autoinc);
+			if (!wsrep_on(ha_thd()))
+			{
+#endif /* WITH_WSREP */
 			current = autoinc - prebuilt->autoinc_increment;
+#ifdef WITH_WSREP
+			}
+#endif /* WITH_WSREP */
 
 			current = innobase_next_autoinc(
 				current, 1, increment, 1, col_max_value);