diff options
| author | unknown <wax@kishkin.ru> | 2003-03-18 04:07:40 +0500 |
|---|---|---|
| committer | unknown <wax@kishkin.ru> | 2003-03-18 04:07:40 +0500 |
| commit | 0b505fb437eedd1b31c99888247c2259539c095b (patch) | |
| tree | d5655e0a1fd7bd5c629fbc934a708f44ea818663 /sql/lex.h | |
| parent | c312cd45786f22f0fed89d4cb2d6bba7c6c87644 (diff) | |
| download | mariadb-git-0b505fb437eedd1b31c99888247c2259539c095b.tar.gz | |
This is full commit of group_concat with support subselects
include/mysqld_error.h:
add warning
sql/field.h:
add friend class
sql/item_sum.cc:
add function
sql/item_sum.h:
add class
sql/lex.h:
add lex
sql/mysql_priv.h:
change push_warning
sql/mysqld.cc:
add new option
sql/set_var.cc:
add new system variable
sql/share/english/errmsg.txt:
add new message text
sql/sql_class.h:
change MY_ERROR class
sql/sql_error.cc:
change push_warning
sql/sql_lex.h:
add qorder_list for function
sql/sql_yacc.yy:
add structure of group_concat
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'sql/lex.h')
| -rw-r--r-- | sql/lex.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/lex.h b/sql/lex.h index d4ae8c32828..d08c031e822 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -330,6 +330,7 @@ static SYMBOL symbols[] = { { "ROWS", SYM(ROWS_SYM),0,0}, { "RTREE", SYM(RTREE_SYM),0,0}, { "SECOND", SYM(SECOND_SYM),0,0}, + { "SEPARATOR", SYM(SEPARATOR_SYM),0,0}, { "SELECT", SYM(SELECT_SYM),0,0}, { "SERIAL", SYM(SERIAL_SYM),0,0}, { "SERIALIZABLE", SYM(SERIALIZABLE_SYM),0,0}, @@ -490,6 +491,7 @@ static SYMBOL sql_functions[] = { { "GEOMFROMTEXT", SYM(GEOMFROMTEXT),0,0}, { "GLENGTH", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_glength)}, { "GREATEST", SYM(GREATEST_SYM),0,0}, + { "GROUP_CONCAT", SYM(GROUP_CONCAT_SYM),0,0}, { "GROUP_UNIQUE_USERS", SYM(GROUP_UNIQUE_USERS),0,0}, { "HEX", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_hex)}, { "IFNULL", SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_ifnull)}, |