diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-08-31 14:15:52 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-08-31 14:15:52 +0200 |
| commit | 59408093d1add69dd4cd3d1674a73712528aed92 (patch) | |
| tree | 85e7d74ddb7c0a74c6c434b9c3dacfe9b7ebe2a3 /sql/sql_yacc.yy | |
| parent | a1fd37b1fd5803188d3f8b44914cca459f6e622f (diff) | |
| parent | 51e14492e9410718056b0c6d9d4dabd4a96e8070 (diff) | |
| download | mariadb-git-59408093d1add69dd4cd3d1674a73712528aed92.tar.gz | |
5.3 merge
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 8ef59fafb98..220eeb5b9a7 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -5872,9 +5872,9 @@ attribute: NULL_SYM { Lex->type&= ~ NOT_NULL_FLAG; } | not NULL_SYM { Lex->type|= NOT_NULL_FLAG; } | DEFAULT now_or_signed_literal { Lex->default_value=$2; } - | ON UPDATE_SYM NOW_SYM opt_time_precision + | ON UPDATE_SYM NOW_SYM optional_braces { - Item *item= new (YYTHD->mem_root) Item_func_now_local($4); + Item *item= new (YYTHD->mem_root) Item_func_now_local(6); if (item == NULL) MYSQL_YYABORT; Lex->on_update_value= item; @@ -5966,9 +5966,9 @@ type_with_opt_collate: now_or_signed_literal: - NOW_SYM opt_time_precision + NOW_SYM optional_braces { - $$= new (YYTHD->mem_root) Item_func_now_local($2); + $$= new (YYTHD->mem_root) Item_func_now_local(6); if ($$ == NULL) MYSQL_YYABORT; } |