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

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

Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl
into mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
0c03f934 · lars/lthalmann@mysql.com/dl145j.mysql.com · fcf99e85 · ec51f809 · 0c03f934
Commit 0c03f934 authored Sep 20, 2006 by lars/lthalmann@mysql.com/dl145j.mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

sql/sql_yacc.yy sql/sql_yacc.yy +3 -1

No files found.
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -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: