bk commit into 4.1 tree (aelkin:1.2538) BUG#18822

[Andrei Elkin]

Below is the list of changes that have just been committed into a local
4.1 repository of elkin. When elkin 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-08-31 02:00:40+03:00, aelkin@stripped
+1 -0
  BUG#18822 LOAD DATA FROM MASTER corrupts data
  
  there is a bunch of dups. It has been decided to declare this feature as
  deprecated.
    

  sql/sql_yacc.yy@stripped, 2006-08-31 02:00:29+03:00,
aelkin@stripped +3 -1
    deprecation macro

# 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:	aelkin
# Host:	dsl-hkigw8-feaaf900-177.dhcp.inet.fi
# Root:	/net/nb/home/elkin/MySQL/TEAM/FIXES/4.1/18822_load_data_master

--- 1.398/sql/sql_yacc.yy	2006-08-31 02:00:55 +03:00
+++ 1.399/sql/sql_yacc.yy	2006-08-31 02:00:55 +03:00
@@ -4800,14 +4800,16 @@
 	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: