diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-04-26 14:02:37 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-04-26 14:02:37 +0200 |
| commit | 2ce52790ffc72c4a4d3670ebf67c6655450620f2 (patch) | |
| tree | 4be382f34905809f0a19e87574e2b07b91f5cb7c /sql/sql_view.cc | |
| parent | caa9023c9ed101acbcf6b9bd821a09daeb8271ee (diff) | |
| parent | 757daa4174ed1b8786d0307852f79885dd08ea89 (diff) | |
| download | mariadb-git-2ce52790ffc72c4a4d3670ebf67c6655450620f2.tar.gz | |
Merge branch '5.5' into 10.1
Diffstat (limited to 'sql/sql_view.cc')
| -rw-r--r-- | sql/sql_view.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_view.cc b/sql/sql_view.cc index 4d7c3de9337..cef20ba08f9 100644 --- a/sql/sql_view.cc +++ b/sql/sql_view.cc @@ -435,7 +435,7 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views, */ if (lex->current_select->lock_type != TL_READ_DEFAULT) { - lex->current_select->set_lock_for_tables(TL_READ_DEFAULT); + lex->current_select->set_lock_for_tables(TL_READ_DEFAULT, false); view->mdl_request.set_type(MDL_EXCLUSIVE); } @@ -1528,6 +1528,7 @@ bool mysql_make_view(THD *thd, TABLE_SHARE *share, TABLE_LIST *table, { tbl->lock_type= table->lock_type; tbl->mdl_request.set_type(table->mdl_request.type); + tbl->updating= table->updating; } /* If the view is mergeable, we might want to |