manual merge

388b4df7 · lars/lthalmann@mysql.com/dl145k.mysql.com · a1c70022 · 388b4df7
Commit 388b4df7 authored Sep 11, 2006 by lars/lthalmann@mysql.com/dl145k.mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

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

No files found.
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -8744,9 +8744,6 @@ load:   LOAD DATA_SYM
 	    YYABORT;
 	  }
          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;
        };
@@ -8785,7 +8782,7 @@ load_data:
 	FROM MASTER_SYM
        {
 	  Lex->sql_command = SQLCOM_LOAD_MASTER_DATA;
-          WARN_DEPRECATED("LOAD DATA FROM MASTER",
+          WARN_DEPRECATED(yythd, "5.2", "LOAD DATA FROM MASTER",
                          "mysqldump or future "
                          "BACKUP/RESTORE DATABASE facility");
        };