diff options
| author | Igor Babaev <igor@askmonty.org> | 2016-09-04 20:42:07 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2016-09-04 20:42:07 -0700 |
| commit | 7faff4de8282bbcc98832ee99aefdde9097a5868 (patch) | |
| tree | 03ef58a16e6de2d5534e13e7dfb7f456cc7ce66a /sql/sql_view.cc | |
| parent | 3b40f78eded4e529bacf09c9c28d4749b9b66812 (diff) | |
| parent | 1da21cd4a58ba61274475b5a54592ea1b82a2f13 (diff) | |
| download | mariadb-git-7faff4de8282bbcc98832ee99aefdde9097a5868.tar.gz | |
Merge branch '10.2' into 10.2-mdev9197
Diffstat (limited to 'sql/sql_view.cc')
| -rw-r--r-- | sql/sql_view.cc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sql/sql_view.cc b/sql/sql_view.cc index 4744b442842..c0d9ba48121 100644 --- a/sql/sql_view.cc +++ b/sql/sql_view.cc @@ -435,7 +435,16 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views, res= TRUE; goto err; } - + + /* + ignore lock specs for CREATE statement + */ + if (lex->current_select->lock_type != TL_READ_DEFAULT) + { + lex->current_select->set_lock_for_tables(TL_READ_DEFAULT); + view->mdl_request.set_type(MDL_EXCLUSIVE); + } + if (thd->open_temporary_tables(lex->query_tables) || open_and_lock_tables(thd, lex->query_tables, TRUE, 0)) { |