bk commit into 4.1 tree (lars:1.2570)

[Lars Thalmann]

Below is the list of changes that have just been committed into a local
4.1 repository of lthalmann. When lthalmann does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-09-20 16:17:30+02:00, lars@stripped +1 -0
  Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl
  into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
  MERGE: 1.2532.7.1

  sql/sql_yacc.yy@stripped, 2006-09-20 16:17:26+02:00, lars@stripped +0 -0
    Auto merged
    MERGE: 1.398.1.1

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	lars
# Host:	dl145j.mysql.com
# Root:	/users/lthalmann/bk/MERGE/mysql-4.1-merge/RESYNC

--- 1.400/sql/sql_yacc.yy	2006-09-20 16:17:44 +02:00
+++ 1.401/sql/sql_yacc.yy	2006-09-20 16:17:44 +02:00
@@ -4803,14 +4803,16 @@ load:	LOAD DATA_SYM load_data_lock opt_l
 	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;
-
+	  
         }
         |
 	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: