diff options
| author | unknown <lars/lthalmann@dl145j.mysql.com> | 2006-09-15 01:46:47 +0200 |
|---|---|---|
| committer | unknown <lars/lthalmann@dl145j.mysql.com> | 2006-09-15 01:46:47 +0200 |
| commit | f2783c9217f154a22ba8a2958180190554883b02 (patch) | |
| tree | 113215b4a0f6b7ce13a759c6061bfdb8d210b085 /sql/sql_yacc.yy | |
| parent | 6a490444a615b9fd8ee057f71c215175cd6eb4cc (diff) | |
| parent | dbf1feb170963a1e6afc5e3d3a47e91a316baece (diff) | |
| download | mariadb-git-f2783c9217f154a22ba8a2958180190554883b02.tar.gz | |
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/field.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
client/mysqldump.c:
Merge main->rpl
mysql-test/r/variables.result:
Merge main->rpl
mysql-test/t/disabled.def:
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 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index b1a1e9cb9af..bdb05621a60 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -8782,6 +8782,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: |