summaryrefslogtreecommitdiff
path: root/sql/sql_yacc.yy
diff options
context:
space:
mode:
authorlars/lthalmann@mysql.com/dl145j.mysql.com <>2006-09-15 01:26:28 +0200
committerlars/lthalmann@mysql.com/dl145j.mysql.com <>2006-09-15 01:26:28 +0200
commit2840596e1017b3df8d27697463538a7a41cd2380 (patch)
tree53ae82054ec6a32a2109e9877a45c8473dc9bc69 /sql/sql_yacc.yy
parent38a450b44a64176effcc94a26f65f3d049fd2b73 (diff)
parent6ad198e997e82fdc5b44b1a7db2a8856e775b674 (diff)
downloadmariadb-git-2840596e1017b3df8d27697463538a7a41cd2380.tar.gz
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
Diffstat (limited to 'sql/sql_yacc.yy')
-rw-r--r--sql/sql_yacc.yy6
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: