summaryrefslogtreecommitdiff
path: root/sql/item_create.cc
diff options
context:
space:
mode:
authorhalfspawn <j.brauge@qualiac.com>2017-05-18 11:43:24 +0200
committerhalfspawn <j.brauge@qualiac.com>2017-05-18 11:43:24 +0200
commit87d952746f46679128ad5d73fb690ddfce325ace (patch)
tree5698f62f287335e2b266e496245c93f8b2a9e6f9 /sql/item_create.cc
parent5b034f1cf86b91a463878ce7e63018aa5e4ab072 (diff)
downloadmariadb-git-87d952746f46679128ad5d73fb690ddfce325ace.tar.gz
MDEV-12783 : sql_mode=ORACLE: Functions LENGTH() and LENGTHB()
Diffstat (limited to 'sql/item_create.cc')
-rw-r--r--sql/item_create.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/item_create.cc b/sql/item_create.cc
index 60b39035d1b..50e7fccee18 100644
--- a/sql/item_create.cc
+++ b/sql/item_create.cc
@@ -5684,11 +5684,9 @@ Create_func_length Create_func_length::s_singleton;
Item*
Create_func_length::create_1_arg(THD *thd, Item *arg1)
{
-#if 0 // Not yet
if (thd->variables.sql_mode & MODE_ORACLE)
return new (thd->mem_root) Item_func_char_length(thd, arg1);
else
-#endif
return new (thd->mem_root) Item_func_octet_length(thd, arg1);
}
@@ -6978,6 +6976,7 @@ static Native_func_registry func_array[] =
{ { C_STRING_WITH_LEN("LCASE") }, BUILDER(Create_func_lcase)},
{ { C_STRING_WITH_LEN("LEAST") }, BUILDER(Create_func_least)},
{ { C_STRING_WITH_LEN("LENGTH") }, BUILDER(Create_func_length)},
+ { { C_STRING_WITH_LEN("LENGTHB") }, BUILDER(Create_func_octet_length)},
#ifndef DBUG_OFF
{ { C_STRING_WITH_LEN("LIKE_RANGE_MIN") }, BUILDER(Create_func_like_range_min)},
{ { C_STRING_WITH_LEN("LIKE_RANGE_MAX") }, BUILDER(Create_func_like_range_max)},