Merge 5.5 into 10.0

Author: dr-m

storage/xtradb/handler/ha_innodb.cc

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2000, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2000, 2018, Oracle and/or its affiliates. All Rights Reserved.
 Copyright (c) 2008, 2009 Google Inc.
 Copyright (c) 2009, Percona Inc.
 Copyright (c) 2012, Facebook Inc.
@@ -13717,6 +13717,7 @@ ha_innobase::start_stmt(
 case SQLCOM_INSERT:
 case SQLCOM_UPDATE:
 case SQLCOM_DELETE:
+case SQLCOM_REPLACE:
 init_table_handle_for_HANDLER();
 prebuilt->select_lock_type = LOCK_X;
 prebuilt->stored_select_lock_type = LOCK_X;