diff options
| author | unknown <lars/lthalmann@mysql.com/dl145j.mysql.com> | 2006-09-11 13:50:41 +0200 |
|---|---|---|
| committer | unknown <lars/lthalmann@mysql.com/dl145j.mysql.com> | 2006-09-11 13:50:41 +0200 |
| commit | e573a77592312759d5a5ea28a88ef19956963028 (patch) | |
| tree | 478a46b1b16dc847e7fa20abe6d5bd957327d419 /sql | |
| parent | 83e0c9d1536500e1072d7b22e7fe1fa6bb4e9e8d (diff) | |
| parent | 2780bad0539ba039d2152f0d820f0a1b55578a0c (diff) | |
| download | mariadb-git-e573a77592312759d5a5ea28a88ef19956963028.tar.gz | |
Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
sql/sql_yacc.yy:
Manual merge (rpl 4.1 -> rpl 5.0)
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_yacc.yy | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 425945f525e..fbde9e2884f 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -6873,6 +6873,9 @@ load: LOAD DATA_SYM YYABORT; } lex->sql_command = SQLCOM_LOAD_MASTER_TABLE; + WARN_DEPRECATED(yythd, "5.2", "LOAD TABLE FROM MASTER", + "mysqldump or future " + "BACKUP/RESTORE DATABASE facility"); if (!Select->add_table_to_list(YYTHD, $3, NULL, TL_OPTION_UPDATING)) YYABORT; }; @@ -6911,6 +6914,9 @@ load_data: FROM MASTER_SYM { Lex->sql_command = SQLCOM_LOAD_MASTER_DATA; + WARN_DEPRECATED(yythd, "5.2", "LOAD DATA FROM MASTER", + "mysqldump or future " + "BACKUP/RESTORE DATABASE facility"); }; opt_local: |