diff options
author | Alexander Barkov <bar@mariadb.org> | 2017-02-27 17:47:06 +0400 |
---|---|---|
committer | Alexander Barkov <bar@mariadb.org> | 2017-04-05 15:02:57 +0400 |
commit | 839e0947eea1660aa437b77520388e062bac4f63 (patch) | |
tree | 8074b563481022172ddf166cc8337f39204cfda3 /sql/item_create.cc | |
parent | 915c5df865909b6801d6b5f43a48a5998a2e0de5 (diff) | |
download | mariadb-git-839e0947eea1660aa437b77520388e062bac4f63.tar.gz |
MDEV-12143 sql_mode=ORACLE: make the CONCAT function ignore NULL arguments
Diffstat (limited to 'sql/item_create.cc')
-rw-r--r-- | sql/item_create.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/item_create.cc b/sql/item_create.cc index 6b0a8d2c87f..d488b5f26c0 100644 --- a/sql/item_create.cc +++ b/sql/item_create.cc @@ -3857,7 +3857,9 @@ Create_func_concat::create_native(THD *thd, LEX_STRING name, return NULL; } - return new (thd->mem_root) Item_func_concat(thd, *item_list); + return thd->variables.sql_mode & MODE_ORACLE ? + new (thd->mem_root) Item_func_concat_operator_oracle(thd, *item_list) : + new (thd->mem_root) Item_func_concat(thd, *item_list); } Create_func_decode_histogram Create_func_decode_histogram::s_singleton; |