Commit 68f7928f authored by unknown's avatar unknown

Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0

into  dl145j.mysql.com:/tmp/andrei/5.0-bug18715_drop_view_slave

parents 8077c693 0e19aa9e
#
# BUG18715 create view with replicate*ignore-table
# The option is needed to force slave executes tables_ok
# which must return OK in conditions of this tests (no table foo is used)
--replicate-ignore-table=test.foo
...@@ -3390,7 +3390,7 @@ alter: ...@@ -3390,7 +3390,7 @@ alter:
lex->sql_command= SQLCOM_CREATE_VIEW; lex->sql_command= SQLCOM_CREATE_VIEW;
lex->create_view_mode= VIEW_ALTER; lex->create_view_mode= VIEW_ALTER;
/* first table in list is target VIEW name */ /* first table in list is target VIEW name */
lex->select_lex.add_table_to_list(thd, $6, NULL, 0); lex->select_lex.add_table_to_list(thd, $6, NULL, TL_OPTION_UPDATING);
} }
view_list_opt AS view_select view_check_option view_list_opt AS view_select view_check_option
{} {}
...@@ -9025,7 +9025,7 @@ view_tail: ...@@ -9025,7 +9025,7 @@ view_tail:
LEX *lex= thd->lex; LEX *lex= thd->lex;
lex->sql_command= SQLCOM_CREATE_VIEW; lex->sql_command= SQLCOM_CREATE_VIEW;
/* first table in list is target VIEW name */ /* first table in list is target VIEW name */
if (!lex->select_lex.add_table_to_list(thd, $3, NULL, 0)) if (!lex->select_lex.add_table_to_list(thd, $3, NULL, TL_OPTION_UPDATING))
YYABORT; YYABORT;
} }
view_list_opt AS view_select view_check_option view_list_opt AS view_select view_check_option
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment