diff options
| author | unknown <lars/lthalmann@dl145k.mysql.com> | 2006-09-11 17:14:40 +0200 |
|---|---|---|
| committer | unknown <lars/lthalmann@dl145k.mysql.com> | 2006-09-11 17:14:40 +0200 |
| commit | 797bdc9b93696397b1cd05436a65cf4f702cc7d6 (patch) | |
| tree | 7bd8ea3905536582c25b2ec53bfba16fe527d16b /sql/sql_yacc.yy | |
| parent | 45546f3de81fff2ea14a0921147181a1d97aaae6 (diff) | |
| parent | 70bb923a37257aa6a33abca49d60ed2dd005c65d (diff) | |
| download | mariadb-git-797bdc9b93696397b1cd05436a65cf4f702cc7d6.tar.gz | |
Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
sql/sql_yacc.yy:
Auto merged
client/mysqldump.c:
Manual merge (rpl 5.0 -> rpl 5.1)
mysql-test/r/mysqldump.result:
Manual merge (rpl 5.0 -> rpl 5.1)
mysql-test/t/mysqldump.test:
Manual merge (rpl 5.0 -> rpl 5.1)
Diffstat (limited to 'sql/sql_yacc.yy')
| -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 8527f110ce2..87657d5f4a6 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -8744,6 +8744,9 @@ 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; }; @@ -8782,6 +8785,9 @@ load_data: FROM MASTER_SYM { Lex->sql_command = SQLCOM_LOAD_MASTER_DATA; + WARN_DEPRECATED("LOAD DATA FROM MASTER", + "mysqldump or future " + "BACKUP/RESTORE DATABASE facility"); }; opt_local: |