summaryrefslogtreecommitdiff
path: root/sql/lex.h
diff options
context:
space:
mode:
authorunknown <malff/marcsql@weblab.(none)>2007-01-11 14:58:05 -0700
committerunknown <malff/marcsql@weblab.(none)>2007-01-11 14:58:05 -0700
commit6bc937450411980032b7aea23643053878cfb36d (patch)
tree53f7cc34c8a22ed9ceaf16d39f046e08a1c24778 /sql/lex.h
parenta350fb5bab57eaa991b0cc8c2693ba577380bb2c (diff)
downloadmariadb-git-6bc937450411980032b7aea23643053878cfb36d.tar.gz
Bug#22687 (Functions UNIQUE_USERS, GROUP_UNIQUE_USERS)
According to some internal communication, these two functions are place holders for future enhancements. Because they use a variable number of parameters, the implementation defined a reserved keyword for them in the parser grammar. Unfortunately, doing so creates a bug similar to Bug 21114 reported for the function FORMAT. In the 5.1 code base, due to improvements in the code implemented with bug 21114, having a reserved keyword for functions with a variable number of arguments is not needed any more by the implementation. As a result, this fix removes the place-holder implementation, and removes the unnecessary reserved keywords. Should the functions UNIQUE_USERS and GROUP_UNIQUE_USERS be finally implemented in a later release, the implementation should sub class Create_native_func in sql/item_create.cc. For example, see the class Create_func_concat. BitKeeper/deleted/.del-item_uniq.cc: Rename: sql/item_uniq.cc -> BitKeeper/deleted/.del-item_uniq.cc BitKeeper/deleted/.del-item_uniq.h: Rename: sql/item_uniq.h -> BitKeeper/deleted/.del-item_uniq.h libmysqld/Makefile.am: Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS(). mysql-test/r/parser.result: Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS(). mysql-test/t/parser.test: Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS(). sql/Makefile.am: Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS(). sql/item.h: Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS(). sql/item_sum.h: Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS(). sql/lex.h: Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS(). sql/mysql_priv.h: Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS(). sql/sql_yacc.yy: Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS().
Diffstat (limited to 'sql/lex.h')
-rw-r--r--sql/lex.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/lex.h b/sql/lex.h
index 254d7f10fb7..aff8149efd0 100644
--- a/sql/lex.h
+++ b/sql/lex.h
@@ -593,7 +593,6 @@ static SYMBOL sql_functions[] = {
{ "DATE_SUB", SYM(DATE_SUB_INTERVAL)},
{ "EXTRACT", SYM(EXTRACT_SYM)},
{ "GROUP_CONCAT", SYM(GROUP_CONCAT_SYM)},
- { "GROUP_UNIQUE_USERS", SYM(GROUP_UNIQUE_USERS)},
{ "MAX", SYM(MAX_SYM)},
{ "MID", SYM(SUBSTRING)}, /* unireg function */
{ "MIN", SYM(MIN_SYM)},
@@ -611,7 +610,6 @@ static SYMBOL sql_functions[] = {
{ "SYSDATE", SYM(SYSDATE)},
{ "SYSTEM_USER", SYM(USER)},
{ "TRIM", SYM(TRIM)},
- { "UNIQUE_USERS", SYM(UNIQUE_USERS)},
{ "VARIANCE", SYM(VARIANCE_SYM)},
{ "VAR_POP", SYM(VARIANCE_SYM)},
{ "VAR_SAMP", SYM(VAR_SAMP_SYM)},