diff options
| author | Igor Babaev <igor@askmonty.org> | 2016-08-30 16:14:51 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2016-08-30 16:14:51 -0700 |
| commit | 2250e9ea261f661cb73c147a28f4d30655d7483d (patch) | |
| tree | 04673b47943fdb137f8fe5bafdb64a24887f8c0f /sql/sql_view.cc | |
| parent | cb1e44219b9beae92e104cfe5e67aab3073dd8aa (diff) | |
| parent | 4ca7b226c05ae883accec64b1afe6d60daf1b323 (diff) | |
| download | mariadb-git-2250e9ea261f661cb73c147a28f4d30655d7483d.tar.gz | |
Merge 10.2 into 10.2-mdev9864.
Diffstat (limited to 'sql/sql_view.cc')
| -rw-r--r-- | sql/sql_view.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_view.cc b/sql/sql_view.cc index 75b4021d91a..4744b442842 100644 --- a/sql/sql_view.cc +++ b/sql/sql_view.cc @@ -1,5 +1,5 @@ /* Copyright (c) 2004, 2013, Oracle and/or its affiliates. - Copyright (c) 2011, 2015, MariaDB + Copyright (c) 2011, 2016, MariaDB Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -435,8 +435,8 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views, res= TRUE; goto err; } - - if (open_temporary_tables(thd, lex->query_tables) || + + if (thd->open_temporary_tables(lex->query_tables) || open_and_lock_tables(thd, lex->query_tables, TRUE, 0)) { view= lex->unlink_first_table(&link_to_local); |