diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-12-02 16:23:16 +0100 |
|---|---|---|
| committer | Aleksey Midenkov <midenok@gmail.com> | 2017-12-08 16:24:56 +0300 |
| commit | ea1ccfa5000c7f5d01895e3474b2929eee52e2e8 (patch) | |
| tree | 9c4de828733be12c1e9788cdfe6a282bede21cdd /sql/lex.h | |
| parent | d3845132fc50e0bf268b5a9ac904ed89cc533cb5 (diff) | |
| download | mariadb-git-ea1ccfa5000c7f5d01895e3474b2929eee52e2e8.tar.gz | |
SQL: regression fix: make NOW a valid identifier again [#363]
* again, as in 10.2, NOW is a keyword only if followed by parentheses
* use AS OF CURRENT_TIMESTAMP or AS OF NOW()
* AS OF CURRENT_TIMESTAMP and AS OF NOW() mean AS OF NOW(6),
not AS OF NOW(0), (same behavior as in a DEFAULT clause)
Diffstat (limited to 'sql/lex.h')
| -rw-r--r-- | sql/lex.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/lex.h b/sql/lex.h index f0ee16dea57..25b6b834a55 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -428,7 +428,6 @@ static SYMBOL symbols[] = { { "NONE", SYM(NONE_SYM)}, { "NOT", SYM(NOT_SYM)}, { "NOTFOUND", SYM(NOTFOUND_SYM)}, - { "NOW", SYM(NOW_SYM)}, { "NO_WRITE_TO_BINLOG", SYM(NO_WRITE_TO_BINLOG)}, { "NULL", SYM(NULL_SYM)}, { "NUMBER", SYM(NUMBER_SYM)}, @@ -746,6 +745,7 @@ static SYMBOL sql_functions[] = { { "MEDIAN", SYM(MEDIAN_SYM)}, { "MID", SYM(SUBSTRING)}, /* unireg function */ { "MIN", SYM(MIN_SYM)}, + { "NOW", SYM(NOW_SYM)}, { "NTH_VALUE", SYM(NTH_VALUE_SYM)}, { "NTILE", SYM(NTILE_SYM)}, { "POSITION", SYM(POSITION_SYM)}, |