manual merge

sql/sql_yacc.yy:
  Manual merge

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");
         };