diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-01-21 12:14:34 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-01-21 12:14:34 +0300 |
| commit | 08bcd2d8f67dcacd36abd2592fa2a59321abe7c2 (patch) | |
| tree | 1a7e0403e8ed7b5ae817b8249812184027c9cd68 /sql/sql_view.cc | |
| parent | b6685d35dcc45e4fc8eca53fa8f6d3315f2e6b89 (diff) | |
| parent | 8b7d5366ce40280d634bf56f342342fab9d90287 (diff) | |
| download | mariadb-git-08bcd2d8f67dcacd36abd2592fa2a59321abe7c2.tar.gz | |
Auto-merge from mysql-next-mr.
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 346532bdfb6..31e4a45ce4f 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; } @@ -1309,8 +1309,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()); |