diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-07-30 15:44:31 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-07-30 15:44:31 +0300 |
| commit | 7c773abdf7651b034b3807912409ccb6e8b68895 (patch) | |
| tree | adbb1003170dbe366b5447e371adbe6676b3fb20 | |
| parent | 4c21c367b332e4ebfff0b0c1f6f5140d5845588e (diff) | |
| parent | a49ec980422e04ce1a37344be09aa6254f16fa2a (diff) | |
| download | mariadb-git-7c773abdf7651b034b3807912409ccb6e8b68895.tar.gz | |
Merge 5.5 into 10.0
| -rw-r--r-- | storage/xtradb/handler/ha_innodb.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc index f153b6e28ae..3553674040a 100644 --- a/storage/xtradb/handler/ha_innodb.cc +++ b/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; |