database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge next-mr -> next-4284.

Browse Source
This commit is contained in:
Konstantin Osipov
2010-02-05 01:08:08 +03:00
parent 06e1a73af6 b78e3a5d1e
commit ad0f1f8021
356 changed files with 56816 additions and 12061 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_view.cc
View File

@ -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());