diff options
| author | unknown <serg@serg.mysql.com> | 2003-01-28 00:55:41 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2003-01-28 00:55:41 +0100 |
| commit | 0d470b8d7723629776609892e4fc400b17ad8359 (patch) | |
| tree | 15a7b5601b010be414ee68b5a604b38637aeb057 /sql/item_create.cc | |
| parent | 48f587a8836bd0b4a8e98bc87a9b98133b58fef5 (diff) | |
| download | mariadb-git-0d470b8d7723629776609892e4fc400b17ad8359.tar.gz | |
do not force CONNECTION_ID(), FOUND_ROWS(), PI(), CURRENT_USER(),
and VERSION() to be uppercase in e.g. "select pi()"
mysql-test/r/func_math.result:
result updated
mysql-test/r/select_found.result:
result updated
mysql-test/r/union.result:
result updated
Diffstat (limited to 'sql/item_create.cc')
| -rw-r--r-- | sql/item_create.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/item_create.cc b/sql/item_create.cc index c6fca1c01e1..f298a3e08d1 100644 --- a/sql/item_create.cc +++ b/sql/item_create.cc @@ -77,7 +77,7 @@ Item *create_func_connection_id(void) { THD *thd=current_thd; thd->safe_to_cache_query=0; - return new Item_int("CONNECTION_ID()",(longlong) thd->thread_id,10); + return new Item_int(NullS,(longlong) thd->thread_id,10); } Item *create_func_conv(Item* a, Item *b, Item *c) @@ -145,7 +145,7 @@ Item *create_func_found_rows(void) { THD *thd=current_thd; thd->safe_to_cache_query=0; - return new Item_int("FOUND_ROWS()",(longlong) thd->found_rows(),21); + return new Item_int(NullS,(longlong) thd->found_rows(),21); } Item *create_func_from_days(Item* a) @@ -283,7 +283,7 @@ Item *create_func_period_diff(Item* a, Item *b) Item *create_func_pi(void) { - return new Item_real("PI()",M_PI,6,8); + return new Item_real(NullS,M_PI,6,8); } Item *create_func_pow(Item* a, Item *b) @@ -299,7 +299,7 @@ Item *create_func_current_user() length= (uint) (strxmov(buff, thd->priv_user, "@", thd->host_or_ip, NullS) - buff); - return new Item_string("CURRENT_USER()", thd->memdup(buff, length), length); + return new Item_string(NullS, thd->memdup(buff, length), length); } Item *create_func_quarter(Item* a) @@ -405,7 +405,7 @@ Item *create_func_ucase(Item* a) Item *create_func_version(void) { - return new Item_string("VERSION()",server_version, strlen(server_version)); + return new Item_string(NullS,server_version, strlen(server_version)); } Item *create_func_weekday(Item* a) |