diff options
| author | unknown <evgen@moonbone.local> | 2007-06-11 00:16:00 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2007-06-11 00:16:00 +0400 |
| commit | 237a1d22f1955d015ffa3f958d4c3f25078559c8 (patch) | |
| tree | 387ae7083c1c43ac2d17f79b83bd3c85fb65fc16 /sql/sql_yacc.yy | |
| parent | a7f5132591f631f5141522bca27cbdfda9a6020e (diff) | |
| parent | 88d5c0146b78ddee5816fc256e9b2b0635df2445 (diff) | |
| download | mariadb-git-237a1d22f1955d015ffa3f958d4c3f25078559c8.tar.gz | |
Merge moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
into moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
mysql-test/r/gis.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/gis.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
mysql-test/include/mix1.inc:
Manually merged
mysql-test/r/innodb_mysql.result:
Manually merged
mysql-test/r/type_datetime.result:
Manually merged
mysql-test/t/type_datetime.test:
Manually merged
sql/field.h:
Manually merged
sql/sql_select.cc:
Manually merged
sql/sql_yacc.yy:
Manually merged
tests/mysql_client_test.c:
Manually merged
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 2b256070276..523fd254d6c 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -9046,6 +9046,7 @@ purge: { LEX *lex=Lex; lex->type=0; + lex->sql_command = SQLCOM_PURGE; } purge_options {} ; @@ -9057,7 +9058,6 @@ purge_options: purge_option: TO_SYM TEXT_STRING_sys { - Lex->sql_command = SQLCOM_PURGE; Lex->to_log = $2.str; } | BEFORE_SYM expr |