diff options
| author | unknown <igor@rurik.mysql.com> | 2003-06-18 07:31:23 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2003-06-18 07:31:23 -0700 |
| commit | 4d1b1a3266c980d961d33c54416d028279f77d0c (patch) | |
| tree | 27ab3e463780703cee768e7eca750774895f6cb6 /sql/sql_yacc.yy | |
| parent | 4a83fca1d7fcd5155b45350b90f0f220d3379aa6 (diff) | |
| parent | a33ccd9e2f21ab7986a80651b7c3b905550cdba4 (diff) | |
| download | mariadb-git-4d1b1a3266c980d961d33c54416d028279f77d0c.tar.gz | |
Merge
BitKeeper/etc/logging_ok:
auto-union
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 0b18b7ffdc5..2eb65eab288 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1502,7 +1502,9 @@ keys_or_index: opt_unique_or_fulltext: /* empty */ { $$= Key::MULTIPLE; } | UNIQUE_SYM { $$= Key::UNIQUE; } - | SPATIAL_SYM { $$= Key::SPATIAL; }; + | FULLTEXT_SYM { $$= Key::FULLTEXT;} + | SPATIAL_SYM { $$= Key::SPATIAL; } + ; key_alg: /* empty */ { $$= HA_KEY_ALG_UNDEF; } @@ -3903,7 +3905,7 @@ purge_option: } Item *tmp= new Item_func_unix_timestamp($2); Lex->sql_command = SQLCOM_PURGE_BEFORE; - Lex->purge_time= tmp->val_int(); + Lex->purge_time= (ulong) tmp->val_int(); } ; |