diff options
| author | lars/lthalmann@mysql.com/dl145k.mysql.com <> | 2006-09-11 19:45:09 +0200 |
|---|---|---|
| committer | lars/lthalmann@mysql.com/dl145k.mysql.com <> | 2006-09-11 19:45:09 +0200 |
| commit | 388b4df74eaed770759ef8566f7ee38e724bab83 (patch) | |
| tree | 3b7af8aa408be083fa49623a473eec4dd236ed9b | |
| parent | a1c70022f22ea810f3245cd376e9e7c0cc1d0ba9 (diff) | |
| download | mariadb-git-388b4df74eaed770759ef8566f7ee38e724bab83.tar.gz | |
manual merge
| -rw-r--r-- | sql/sql_yacc.yy | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 87657d5f4a6..93a23873c73 100644 --- 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"); }; |