Commit 941e5020 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl 

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge


sql/sql_yacc.yy:
  Auto merged
parents 96dbaffd a72cd538

sql/sql_yacc.yy

+3 −1
Original line number Diff line number Diff line
@@ -4803,6 +4803,7 @@ load: LOAD DATA_SYM load_data_lock opt_local INFILE TEXT_STRING_sys 
	LOAD TABLE_SYM table_ident FROM MASTER_SYM

        {

	  Lex->sql_command = SQLCOM_LOAD_MASTER_TABLE;

	  WARN_DEPRECATED("LOAD TABLE FROM MASTER", "mysqldump or future BACKUP/RESTORE DATABASE facility");

	  if (!Select->add_table_to_list(YYTHD, $3, NULL, TL_OPTION_UPDATING))

	    YYABORT;
@@ -4811,6 +4812,7 @@ load: LOAD DATA_SYM load_data_lock opt_local INFILE TEXT_STRING_sys 
	LOAD DATA_SYM FROM MASTER_SYM

        {

	  Lex->sql_command = SQLCOM_LOAD_MASTER_DATA;

	  WARN_DEPRECATED("LOAD DATA FROM MASTER", "mysqldump or future BACKUP/RESTORE DATABASE facility");

        };



opt_local: