diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-04-19 22:27:02 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-04-19 22:31:26 +0200 |
| commit | 1a019d08012db7b3fa6a42d39342792c3418e75b (patch) | |
| tree | c116066b995f1c7a2d8c11e72aa9fa547a20407b /storage/innobase | |
| parent | 5e61e1716e763315009318081fba5994b8910242 (diff) | |
| parent | c0b4d74b52e7eec9b13af732193f7f8d7abe05de (diff) | |
| download | mariadb-git-1a019d08012db7b3fa6a42d39342792c3418e75b.tar.gz | |
Merge branch 'mysql/5.5' into 5.5
Diffstat (limited to 'storage/innobase')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 3aabfc319c6..c3bacee91ff 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 2000, 2015, 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. @@ -9434,8 +9434,10 @@ 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; error = row_lock_table_for_mysql(prebuilt, NULL, 1); if (error != DB_SUCCESS) { |