diff options
| author | unknown <lars/lthalmann@mysql.com/dl145k.mysql.com> | 2006-09-11 19:45:09 +0200 |
|---|---|---|
| committer | unknown <lars/lthalmann@mysql.com/dl145k.mysql.com> | 2006-09-11 19:45:09 +0200 |
| commit | da9298988f4b6d980b0b818e5fdf62d86e08e771 (patch) | |
| tree | 3b7af8aa408be083fa49623a473eec4dd236ed9b /sql | |
| parent | 797bdc9b93696397b1cd05436a65cf4f702cc7d6 (diff) | |
| download | mariadb-git-da9298988f4b6d980b0b818e5fdf62d86e08e771.tar.gz | |
manual merge
sql/sql_yacc.yy:
Manual merge
Diffstat (limited to 'sql')
| -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"); }; |