diff options
| author | unknown <lars/lthalmann@mysql.com/dl145j.mysql.com> | 2006-09-15 01:26:28 +0200 |
|---|---|---|
| committer | unknown <lars/lthalmann@mysql.com/dl145j.mysql.com> | 2006-09-15 01:26:28 +0200 |
| commit | 2c168ec5684190bddff5a00b59a4ad949b5900b2 (patch) | |
| tree | 53ae82054ec6a32a2109e9877a45c8473dc9bc69 /sql/sql_yacc.yy | |
| parent | 900e66f89567d740c4290963825206ac8a672df8 (diff) | |
| parent | 70bb923a37257aa6a33abca49d60ed2dd005c65d (diff) | |
| download | mariadb-git-2c168ec5684190bddff5a00b59a4ad949b5900b2.tar.gz | |
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
client/mysqldump.c:
Merge main->rpl
mysql-test/r/mysqldump.result:
Merge main->rpl
mysql-test/t/mysqldump.test:
Merge main->rpl
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 d2aca27c836..97db65fb917 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -6892,6 +6892,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; }; @@ -6930,6 +6933,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: |