database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

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

Browse Source 
into  dl145j.mysql.com:/tmp/andrei/5.0-bug18715_drop_view_slave
This commit is contained in:
unknown
2006-04-13 20:55:51 +02:00
parent 8077c693a6 0e19aa9e4e
commit 68f7928fbd
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/t/rpl_view-slave.opt Normal file
View File

@ -0,0 +1,5 @@
#
# 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

4
sql/sql_yacc.yy
View File

@ -3390,7 +3390,7 @@ alter:
lex->sql_command= SQLCOM_CREATE_VIEW;
lex->create_view_mode= VIEW_ALTER;
/* 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
{}
@ -9025,7 +9025,7 @@ view_tail:
LEX *lex= thd->lex;
lex->sql_command= SQLCOM_CREATE_VIEW;
/* 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;
}
view_list_opt AS view_select view_check_option