Commit 68f7928f authored by unknown's avatar unknown
Browse files

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

mysql-test/t/rpl_view-slave.opt

0 → 100644
+5 −0
Original line number Diff line number Diff line 
#

# 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

sql/sql_yacc.yy

+2 −2
Original line number Diff line number Diff line
@@ -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