diff options
| author | unknown <dlenev@brandersnatch.localdomain> | 2005-01-11 14:26:40 +0300 |
|---|---|---|
| committer | unknown <dlenev@brandersnatch.localdomain> | 2005-01-11 14:26:40 +0300 |
| commit | 39ee25b3742188026dcc0bcee60951668a4a2275 (patch) | |
| tree | 69b409bd5ca1149ad22e13b6a497d45ca7bad03a /sql/sql_yacc.yy | |
| parent | eae30642cde74965e5f81dca61bd4448a1d889f6 (diff) | |
| download | mariadb-git-39ee25b3742188026dcc0bcee60951668a4a2275.tar.gz | |
Fix for bug #7418 "TIMESTAMP not always converted to DATETIME in MAXDB
mode".
Changed grammar rule for "type" token. Now we have one branch with
optional length specification for TIMESTAMP type instead of two separate
branches.
mysql-test/r/type_timestamp.result:
Added test case for bug #7418 "TIMESTAMP not always converted to DATETIME
in MAXDB mode".
mysql-test/t/type_timestamp.test:
Added test case for bug #7418 "TIMESTAMP not always converted to DATETIME
in MAXDB mode".
sql/sql_yacc.yy:
Changed rule for "type" token. Now we have one branch with optional
length specification for TIMESTAMP type instead of two separate branches.
This also gives us consistent behavior for TIMETSAMP in MAXDB mode.
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index a09694ee1e6..66f7882c4e7 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1415,7 +1415,7 @@ type: | YEAR_SYM opt_len field_options { $$=FIELD_TYPE_YEAR; } | DATE_SYM { $$=FIELD_TYPE_DATE; } | TIME_SYM { $$=FIELD_TYPE_TIME; } - | TIMESTAMP + | TIMESTAMP opt_len { if (YYTHD->variables.sql_mode & MODE_MAXDB) $$=FIELD_TYPE_DATETIME; @@ -1428,13 +1428,6 @@ type: $$=FIELD_TYPE_TIMESTAMP; } } - | TIMESTAMP '(' NUM ')' - { - LEX *lex= Lex; - lex->length= $3.str; - lex->type|= NOT_NULL_FLAG; - $$= FIELD_TYPE_TIMESTAMP; - } | DATETIME { $$=FIELD_TYPE_DATETIME; } | TINYBLOB { Lex->charset=&my_charset_bin; $$=FIELD_TYPE_TINY_BLOB; } |