diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-19 16:48:28 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-19 16:48:28 +0200 |
| commit | 8d70097c216081e8013a548bfbde156e48985816 (patch) | |
| tree | 4cca4f27d804ab261db2ee996f084fb5137833df /sql/sql_view.cc | |
| parent | 079c3599711b9cbd3ce323f32cf99693cc3d5e3b (diff) | |
| parent | 252e690c859b53c51c7eecf072f33dbaaa01bcdf (diff) | |
| download | mariadb-git-8d70097c216081e8013a548bfbde156e48985816.tar.gz | |
Merge 10.1 to 10.2
Follow-up fix to MDEV-14008: Let Field_double::val_uint() silently
return 0 on error
Diffstat (limited to 'sql/sql_view.cc')
| -rw-r--r-- | sql/sql_view.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_view.cc b/sql/sql_view.cc index cdb65a79660..bba79642d87 100644 --- a/sql/sql_view.cc +++ b/sql/sql_view.cc @@ -430,14 +430,14 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views, lex->link_first_table_back(view, link_to_local); view->open_type= OT_BASE_ONLY; - WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL) - if (check_dependencies_in_with_clauses(lex->with_clauses_list)) { res= TRUE; goto err; } + WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL) + /* ignore lock specs for CREATE statement */ |