bk commit into 5.0 tree (lars:1.2247)

[Lars Thalmann]

Below is the list of changes that have just been committed into a local
5.0 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-11 14:45:40+02:00, lars@stripped +1 -0
  Fix WARN_DEPRECATED for 5.0 (it is in 5.1 we should have the extra arguments)

  sql/sql_yacc.yy@stripped, 2006-09-11 14:45:38+02:00, lars@stripped +2 -2
    Fix WARN_DEPRECATED for 5.0 (it is in 5.1 we should have the extra arguments)

# 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-5.0-merge

--- 1.476/sql/sql_yacc.yy	2006-09-11 14:45:56 +02:00
+++ 1.477/sql/sql_yacc.yy	2006-09-11 14:45:56 +02:00
@@ -6873,7 +6873,7 @@ load:   LOAD DATA_SYM
 	    YYABORT;
 	  }
           lex->sql_command = SQLCOM_LOAD_MASTER_TABLE;
-          WARN_DEPRECATED(yythd, "5.2", "LOAD TABLE FROM MASTER",
+          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))
@@ -6914,7 +6914,7 @@ load_data:
 	FROM MASTER_SYM
         {
 	  Lex->sql_command = SQLCOM_LOAD_MASTER_DATA;
-          WARN_DEPRECATED(yythd, "5.2", "LOAD DATA FROM MASTER",
+          WARN_DEPRECATED("LOAD DATA FROM MASTER",
                           "mysqldump or future "
                           "BACKUP/RESTORE DATABASE facility");
         };