Commit e573a775 authored by unknown's avatar unknown
Browse files

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

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


sql/sql_yacc.yy:
  Manual merge (rpl 4.1 -> rpl 5.0)
parents 83e0c9d1 2780bad0

sql/sql_yacc.yy

+6 −0
Original line number Diff line number Diff line
@@ -6873,6 +6873,9 @@ load: LOAD DATA_SYM 
	    YYABORT;

	  }

          lex->sql_command = SQLCOM_LOAD_MASTER_TABLE;

          WARN_DEPRECATED(yythd, "5.2", "LOAD TABLE FROM MASTER",

                          "mysqldump or future "

                          "BACKUP/RESTORE DATABASE facility");

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

            YYABORT;

        };
@@ -6911,6 +6914,9 @@ load_data: 
	FROM MASTER_SYM

        {

	  Lex->sql_command = SQLCOM_LOAD_MASTER_DATA;

          WARN_DEPRECATED(yythd, "5.2", "LOAD DATA FROM MASTER",

                          "mysqldump or future "

                          "BACKUP/RESTORE DATABASE facility");

        };



opt_local: