diff --git a/mysql-test/suite/innodb/include/innodb_binlog.combinations b/mysql-test/suite/innodb/include/innodb_binlog.combinations
new file mode 100644
index 00000000000..46d31e733b1
--- /dev/null
+++ b/mysql-test/suite/innodb/include/innodb_binlog.combinations
@@ -0,0 +1,3 @@
+[log-bin]
+log-bin
+[skip-log-bin]
diff --git a/mysql-test/suite/innodb/include/innodb_binlog.inc b/mysql-test/suite/innodb/include/innodb_binlog.inc
new file mode 100644
index 00000000000..3f6ece2422e
--- /dev/null
+++ b/mysql-test/suite/innodb/include/innodb_binlog.inc
@@ -0,0 +1,3 @@
+# See innodb_binlog.combinations
+# --log-bin is ignored in the embedded server
+--source include/not_embedded.inc
diff --git a/mysql-test/suite/innodb/r/auto_increment_dup,skip-log-bin.rdiff b/mysql-test/suite/innodb/r/auto_increment_dup,skip-log-bin.rdiff
new file mode 100644
index 00000000000..7b4ec54eed8
--- /dev/null
+++ b/mysql-test/suite/innodb/r/auto_increment_dup,skip-log-bin.rdiff
@@ -0,0 +1,51 @@
+--- auto_increment_dup.result
++++ auto_increment_dup,skip-log-bin.reject
+@@ -89,13 +89,14 @@
+ SET DEBUG_SYNC='execute_command_after_close_tables SIGNAL continue';
+ affected rows: 0
+ INSERT INTO t1(k) VALUES (2), (4), (5) ON DUPLICATE KEY UPDATE c='2';
+-ERROR HY000: Lock wait timeout exceeded; try restarting transaction
++affected rows: 3
++info: Records: 3  Duplicates: 0  Warnings: 0
+ connection con1;
+ #
+ # 2 duplicates
+ #
+-affected rows: 3
+-info: Records: 3  Duplicates: 0  Warnings: 0
++affected rows: 4
++info: Records: 3  Duplicates: 1  Warnings: 0
+ connection default;
+ #
+ # 3 rows
+@@ -103,19 +104,21 @@
+ SELECT * FROM t1 order by k;
+ id	k	c
+ 1	1	NULL
+-2	2	NULL
+-3	3	NULL
+-affected rows: 3
++4	2	1
++2	3	NULL
++5	4	NULL
++6	5	NULL
++affected rows: 5
+ INSERT INTO t1(k) VALUES (2), (4), (5) ON DUPLICATE KEY UPDATE c='2';
+-affected rows: 4
+-info: Records: 3  Duplicates: 1  Warnings: 0
++affected rows: 6
++info: Records: 3  Duplicates: 3  Warnings: 0
+ SELECT * FROM t1 order by k;
+ id	k	c
+ 1	1	NULL
+-2	2	2
+-3	3	NULL
+-7	4	NULL
+-8	5	NULL
++4	2	2
++2	3	NULL
++5	4	2
++6	5	2
+ affected rows: 5
+ disconnect con1;
+ disconnect con2;
diff --git a/mysql-test/suite/innodb/r/auto_increment_dup.result b/mysql-test/suite/innodb/r/auto_increment_dup.result
index fa0921b57a5..1467a459fc1 100644
--- a/mysql-test/suite/innodb/r/auto_increment_dup.result
+++ b/mysql-test/suite/innodb/r/auto_increment_dup.result
@@ -1,4 +1,3 @@
-drop table if exists t1;
 set global transaction isolation level repeatable read;
 CREATE TABLE t1(
 id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
@@ -79,20 +78,13 @@ affected rows: 0
 #
 # Parallel execution
 #
-connect con1, localhost, root;
 connect con2, localhost, root;
 SET DEBUG_SYNC='now WAIT_FOR write_row_done';
-connection con1;
-#
-# Connection 1
-#
+connect con1, localhost, root;
 SET DEBUG_SYNC='ha_write_row_end SIGNAL write_row_done WAIT_FOR continue';
 affected rows: 0
 INSERT INTO t1(k) VALUES (1), (2), (3) ON DUPLICATE KEY UPDATE c='1';
 connection con2;
-#
-# Connection 2
-#
 affected rows: 0
 SET DEBUG_SYNC='execute_command_after_close_tables SIGNAL continue';
 affected rows: 0
@@ -140,18 +132,10 @@ k INT,
 c CHAR(1),
 UNIQUE KEY(k)) ENGINE=InnoDB;
 connect con1, localhost, root;
-connect con2, localhost, root;
-connection con1;
-#
-# Connection 1
-#
 SET DEBUG_SYNC='ha_write_row_end SIGNAL continue2 WAIT_FOR continue1';
 affected rows: 0
 INSERT INTO t1(k) VALUES (1), (2), (3) ON DUPLICATE KEY UPDATE c='1';
-connection con2;
-#
-# Connection 2
-#
+connect con2, localhost, root;
 SET DEBUG_SYNC='ha_write_row_start WAIT_FOR continue2';
 affected rows: 0
 SET DEBUG_SYNC='after_mysql_insert SIGNAL continue1';
@@ -159,6 +143,7 @@ affected rows: 0
 INSERT INTO t1(k) VALUES (2), (4), (5) ON DUPLICATE KEY UPDATE c='2';
 affected rows: 3
 info: Records: 3  Duplicates: 0  Warnings: 0
+disconnect con2;
 connection con1;
 affected rows: 4
 info: Records: 3  Duplicates: 1  Warnings: 0
@@ -174,7 +159,6 @@ id	k	c
 5	4	NULL
 6	5	NULL
 disconnect con1;
-disconnect con2;
 connection default;
 DROP TABLE t1;
 set global transaction isolation level repeatable read;
diff --git a/mysql-test/suite/innodb/t/auto_increment_dup.test b/mysql-test/suite/innodb/t/auto_increment_dup.test
index 45e4559a038..aa399e5966d 100644
--- a/mysql-test/suite/innodb/t/auto_increment_dup.test
+++ b/mysql-test/suite/innodb/t/auto_increment_dup.test
@@ -4,11 +4,11 @@
 ##########################################################################
 
 --source include/have_innodb.inc
+--source include/have_debug.inc
 --source include/have_debug_sync.inc
+--source include/innodb_binlog.inc
 
---disable_warnings
-drop table if exists t1;
---enable_warnings
+let $stmt= `SELECT @@GLOBAL.log_bin`;
 
 set global transaction isolation level repeatable read;
 
@@ -69,29 +69,28 @@ CREATE TABLE t1(
        k INT,
        c CHAR(1),
        UNIQUE KEY(k)) ENGINE=InnoDB;
-       
+
 --echo #
 --echo # Parallel execution
 --echo #
 
---connect(con1, localhost, root)
 --connect(con2, localhost, root)
-
 --send SET DEBUG_SYNC='now WAIT_FOR write_row_done'
---connection con1
---echo #
---echo # Connection 1
---echo #
+
+--connect(con1, localhost, root)
 SET DEBUG_SYNC='ha_write_row_end SIGNAL write_row_done WAIT_FOR continue';
 --send INSERT INTO t1(k) VALUES (1), (2), (3) ON DUPLICATE KEY UPDATE c='1'
 --connection con2
---echo #
---echo # Connection 2
---echo #
 --reap
+
 SET DEBUG_SYNC='execute_command_after_close_tables SIGNAL continue';
+if ($stmt) {
 --error ER_LOCK_WAIT_TIMEOUT
 INSERT INTO t1(k) VALUES (2), (4), (5) ON DUPLICATE KEY UPDATE c='2';
+}
+if (!$stmt) {
+INSERT INTO t1(k) VALUES (2), (4), (5) ON DUPLICATE KEY UPDATE c='2';
+}
 
 --connection con1
 --echo #
@@ -138,23 +137,14 @@ CREATE TABLE t1(
 --enable_info
 
 --connect(con1, localhost, root)
---connect(con2, localhost, root)
-
---connection con1
-
---echo #
---echo # Connection 1
---echo #
 SET DEBUG_SYNC='ha_write_row_end SIGNAL continue2 WAIT_FOR continue1';
 --send INSERT INTO t1(k) VALUES (1), (2), (3) ON DUPLICATE KEY UPDATE c='1'
 
---connection con2
---echo #
---echo # Connection 2
---echo #
+--connect(con2, localhost, root)
 SET DEBUG_SYNC='ha_write_row_start WAIT_FOR continue2';
 SET DEBUG_SYNC='after_mysql_insert SIGNAL continue1';
 INSERT INTO t1(k) VALUES (2), (4), (5) ON DUPLICATE KEY UPDATE c='2';
+--disconnect con2
 
 --connection con1
 --reap
@@ -167,11 +157,9 @@ SET DEBUG_SYNC='RESET';
 SELECT * FROM t1 ORDER BY k;
 
 --disconnect con1
---disconnect con2
 
 --connection default
 
 DROP TABLE t1;
 
 set global transaction isolation level repeatable read;
-
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index e581ed0af25..71d5b80eaa3 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -4523,6 +4523,11 @@ extern "C" int thd_rpl_is_parallel(const MYSQL_THD thd)
   return thd->rgi_slave && thd->rgi_slave->is_parallel_exec;
 }
 
+extern "C" int thd_rpl_stmt_based(const MYSQL_THD thd)
+{
+  return !thd->is_current_stmt_binlog_format_row() &&
+    !thd->is_current_stmt_binlog_disabled();
+}
 
 /* Returns high resolution timestamp for the start
   of the current query. */
diff --git a/storage/innobase/include/ha_prototypes.h b/storage/innobase/include/ha_prototypes.h
index 86defe9b166..8af4d320997 100644
--- a/storage/innobase/include/ha_prototypes.h
+++ b/storage/innobase/include/ha_prototypes.h
@@ -122,6 +122,9 @@ thd_is_replication_slave_thread(
 /*============================*/
 	THD*	thd);	/*!< in: thread handle */
 
+/** @return whether statement-based replication is active */
+extern "C" int thd_rpl_stmt_based(const THD* thd);
+
 /******************************************************************//**
 Returns true if the transaction this thread is processing has edited
 non-transactional tables. Used by the deadlock detector when deciding
diff --git a/storage/innobase/que/que0que.cc b/storage/innobase/que/que0que.cc
index 87d37e347f1..99d8c70a2c0 100644
--- a/storage/innobase/que/que0que.cc
+++ b/storage/innobase/que/que0que.cc
@@ -689,7 +689,8 @@ que_thr_stop(
 		trx->lock.wait_thr = thr;
 		thr->state = QUE_THR_LOCK_WAIT;
 
-	} else if (trx->duplicates && trx->error_state == DB_DUPLICATE_KEY) {
+	} else if (trx->duplicates && trx->error_state == DB_DUPLICATE_KEY
+		   && thd_rpl_stmt_based(trx->mysql_thd)) {
 
 		return(FALSE);
 
diff --git a/storage/innobase/row/row0ins.cc b/storage/innobase/row/row0ins.cc
index f72ade422b3..3362e5302b1 100644
--- a/storage/innobase/row/row0ins.cc
+++ b/storage/innobase/row/row0ins.cc
@@ -2299,10 +2299,10 @@ row_ins_duplicate_error_in_clust(
 						  true,
 						  ULINT_UNDEFINED, &heap);
 
-			ulint lock_type;
-
-			lock_type =
+			ulint lock_type =
 				trx->isolation_level <= TRX_ISO_READ_COMMITTED
+				|| (trx->mysql_thd
+				    && !thd_rpl_stmt_based(trx->mysql_thd))
 				? LOCK_REC_NOT_GAP : LOCK_ORDINARY;
 
 			/* We set a lock on the possible duplicate: this
@@ -2342,10 +2342,7 @@ row_ins_duplicate_error_in_clust(
 
 			if (row_ins_dupl_error_with_rec(
 				    rec, entry, cursor->index, offsets)) {
-duplicate:
-				trx->error_info = cursor->index;
-				err = DB_DUPLICATE_KEY;
-				goto func_exit;
+				goto duplicate;
 			}
 		}
 	}
@@ -2388,7 +2385,10 @@ duplicate:
 
 			if (row_ins_dupl_error_with_rec(
 				    rec, entry, cursor->index, offsets)) {
-				goto duplicate;
+duplicate:
+				trx->error_info = cursor->index;
+				err = DB_DUPLICATE_KEY;
+				goto func_exit;
 			}
 		}
 
@@ -3006,9 +3006,11 @@ row_ins_sec_index_entry_low(
 	if (!(flags & BTR_NO_LOCKING_FLAG)
 	    && dict_index_is_unique(index)
 	    && thr_get_trx(thr)->duplicates
-	    && thr_get_trx(thr)->isolation_level >= TRX_ISO_REPEATABLE_READ) {
+	    && thr_get_trx(thr)->isolation_level >= TRX_ISO_REPEATABLE_READ
+	    && thd_rpl_stmt_based(thr_get_trx(thr)->mysql_thd)) {
 
-		/* When using the REPLACE statement or ON DUPLICATE clause, a
+		/* In statement-based replication, when replicating a
+		REPLACE statement or ON DUPLICATE KEY UPDATE clause, a
 		gap lock is taken on the position of the to-be-inserted record,
 		to avoid other concurrent transactions from inserting the same
 		record. */
@@ -3552,14 +3554,15 @@ row_ins(
 	ins_node_t*	node,	/*!< in: row insert node */
 	que_thr_t*	thr)	/*!< in: query thread */
 {
-	dberr_t	err;
-
 	DBUG_ENTER("row_ins");
 
 	DBUG_PRINT("row_ins", ("table: %s", node->table->name.m_name));
 
+	trx_t* trx = thr_get_trx(thr);
+
 	if (node->duplicate) {
-		thr_get_trx(thr)->error_state = DB_DUPLICATE_KEY;
+		ut_ad(thd_rpl_stmt_based(trx->mysql_thd));
+		trx->error_state = DB_DUPLICATE_KEY;
 	}
 
 	if (node->state == INS_NODE_ALLOC_ROW_ID) {
@@ -3585,7 +3588,7 @@ row_ins(
 
 	while (node->index != NULL) {
 		if (node->index->type != DICT_FTS) {
-			err = row_ins_index_entry_step(node, thr);
+			dberr_t err = row_ins_index_entry_step(node, thr);
 
 			switch (err) {
 			case DB_SUCCESS:
@@ -3598,9 +3601,11 @@ row_ins(
 			case DB_DUPLICATE_KEY:
 				ut_ad(dict_index_is_unique(node->index));
 
-				if (thr_get_trx(thr)->isolation_level
+				if (trx->isolation_level
 				    >= TRX_ISO_REPEATABLE_READ
-				    && thr_get_trx(thr)->duplicates) {
+				    && trx->duplicates
+				    && !node->table->is_temporary()
+				    && thd_rpl_stmt_based(trx->mysql_thd)) {
 
 					/* When we are in REPLACE statement or
 					INSERT ..  ON DUPLICATE UPDATE
@@ -3663,7 +3668,7 @@ row_ins(
 						/* Save 1st dup error. Ignore
 						subsequent dup errors. */
 						node->duplicate = node->index;
-						thr_get_trx(thr)->error_state
+						trx->error_state
 							= DB_DUPLICATE_KEY;
 					}
 					break;
@@ -3674,18 +3679,6 @@ row_ins(
 			}
 		}
 
-		if (node->duplicate && dict_table_is_temporary(node->table)) {
-			ut_ad(thr_get_trx(thr)->error_state
-			      == DB_DUPLICATE_KEY);
-			/* For TEMPORARY TABLE, we won't lock anything,
-			so we can simply break here instead of requiring
-			GAP locks for other unique secondary indexes,
-			pretending we have consumed all indexes. */
-			node->index = NULL;
-			node->entry = NULL;
-			break;
-		}
-
 		node->index = dict_table_get_next_index(node->index);
 		node->entry = UT_LIST_GET_NEXT(tuple_list, node->entry);
 
@@ -3704,6 +3697,7 @@ row_ins(
 		insertion will take place.  These gap locks are needed
 		only for unique indexes.  So skipping non-unique indexes. */
 		if (node->duplicate) {
+			ut_ad(thd_rpl_stmt_based(trx->mysql_thd));
 			while (node->index
 			       && !dict_index_is_unique(node->index)) {
 
@@ -3712,13 +3706,13 @@ row_ins(
 				node->entry = UT_LIST_GET_NEXT(tuple_list,
 							       node->entry);
 			}
-			thr_get_trx(thr)->error_state = DB_DUPLICATE_KEY;
+			trx->error_state = DB_DUPLICATE_KEY;
 		}
 	}
 
 	ut_ad(node->entry == NULL);
 
-	thr_get_trx(thr)->error_info = node->duplicate;
+	trx->error_info = node->duplicate;
 	node->state = INS_NODE_ALLOC_ROW_ID;
 
 	DBUG_RETURN(node->duplicate ? DB_DUPLICATE_KEY : DB_SUCCESS);