diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-02-05 01:08:08 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-02-05 01:08:08 +0300 |
| commit | ad0f1f8021dff9b93bd963603a790b5c30a7c01a (patch) | |
| tree | a1d34e4650281143b62067088c8965f2cceacb2d /sql/sql_view.cc | |
| parent | 06e1a73af6ca0b912153b10bb23deba8fd333974 (diff) | |
| parent | b78e3a5d1efff8958a2ac44efadbefacaba0f163 (diff) | |
| download | mariadb-git-ad0f1f8021dff9b93bd963603a790b5c30a7c01a.tar.gz | |
Merge next-mr -> next-4284.
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 56dcb6f8ced..931a7adb57f 100644 --- a/sql/sql_view.cc +++ b/sql/sql_view.cc @@ -660,7 +660,7 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views, int errcode= query_error_code(thd, TRUE); if (thd->binlog_query(THD::STMT_QUERY_TYPE, - buff.ptr(), buff.length(), FALSE, FALSE, errcode)) + buff.ptr(), buff.length(), FALSE, FALSE, FALSE, errcode)) res= TRUE; } @@ -1323,8 +1323,8 @@ bool mysql_make_view(THD *thd, File_parser *parser, TABLE_LIST *table, If the view's body needs row-based binlogging (e.g. the VIEW is created from SELECT UUID()), the top statement also needs it. */ - if (lex->is_stmt_unsafe()) - old_lex->set_stmt_unsafe(); + old_lex->set_stmt_unsafe_flags(lex->get_stmt_unsafe_flags()); + view_is_mergeable= (table->algorithm != VIEW_ALGORITHM_TMPTABLE && lex->can_be_merged()); |