diff options
| author | unknown <sergefp@mysql.com> | 2005-08-25 17:39:02 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2005-08-25 17:39:02 +0400 |
| commit | 87c80f5d1d26514b46001a3f40af75346fd5763a (patch) | |
| tree | 1158a1363b2bd4e1562e348140d8750903fb789c /sql/lex.h | |
| parent | 6206b22766b5be25ddefdc88517bc4d877b00ad5 (diff) | |
| parent | b45f0cd09852a71381ae44f68f4c4b585ea0e4c0 (diff) | |
| download | mariadb-git-87c80f5d1d26514b46001a3f40af75346fd5763a.tar.gz | |
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug12335-release2
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/lex.h')
| -rw-r--r-- | sql/lex.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/lex.h b/sql/lex.h index 4bf3671e5be..a5366742fd9 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -696,6 +696,7 @@ static SYMBOL sql_functions[] = { { "MULTIPOINTFROMWKB",SYM(GEOMFROMWKB)}, { "MULTIPOLYGONFROMTEXT",SYM(MPOLYFROMTEXT)}, { "MULTIPOLYGONFROMWKB",SYM(GEOMFROMWKB)}, + { "NAME_CONST", F_SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_name_const)}, { "NOW", SYM(NOW_SYM)}, { "NULLIF", F_SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_nullif)}, { "NUMGEOMETRIES", F_SYM(FUNC_ARG1),0,CREATE_FUNC_GEOM(create_func_numgeometries)}, |