diff options
| author | unknown <lars/lthalmann@mysql.com/dl145j.mysql.com> | 2006-09-20 16:17:30 +0200 |
|---|---|---|
| committer | unknown <lars/lthalmann@mysql.com/dl145j.mysql.com> | 2006-09-20 16:17:30 +0200 |
| commit | 941e502079ba19c80283f8c0c1136e4e469f3d6d (patch) | |
| tree | b2389e7d3ee4cfdbf164e16371e6dbedd5884b97 /sql | |
| parent | 96dbaffda6c606e1769b7feeedf91d9839e820b8 (diff) | |
| parent | a72cd5383287536b3d2db60a0debe5e5feff61df (diff) | |
| download | mariadb-git-941e502079ba19c80283f8c0c1136e4e469f3d6d.tar.gz | |
Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl
into mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_yacc.yy | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 73fab642264..c6f4307f1ea 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -4803,14 +4803,16 @@ load: LOAD DATA_SYM load_data_lock opt_local INFILE TEXT_STRING_sys LOAD TABLE_SYM table_ident FROM MASTER_SYM { 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; - + } | LOAD DATA_SYM 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: |