summaryrefslogtreecommitdiff
path: root/sql/item_strfunc.cc
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2020-07-16 16:30:06 +0300
committerMonty <monty@mariadb.org>2020-07-23 10:54:32 +0300
commit61c15ebe323d4d6f02fab86c405b2613e5784961 (patch)
tree1b8eccd555f01f8819594bbbc373aba55a2c4694 /sql/item_strfunc.cc
parent26824581281fcb2b2251585d8081de38d561ca93 (diff)
downloadmariadb-git-61c15ebe323d4d6f02fab86c405b2613e5784961.tar.gz
Remove String::lex_string() and String::lex_cstring()
- Better to use 'String *' directly. - Added String::get_value(LEX_STRING*) for the few cases where we want to convert a String to LEX_CSTRING. Other things: - Use StringBuffer for some functions to avoid mallocs
Diffstat (limited to 'sql/item_strfunc.cc')
-rw-r--r--sql/item_strfunc.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index bcc041ae9c6..7f853a73c71 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -1391,8 +1391,8 @@ String *Item_func_regexp_replace::val_str(String *str)
!(replace= re.convert_if_needed(replace, &re.replace_converter)))
goto err;
- src= source->lex_cstring();
- rpl= replace->lex_cstring();
+ source->get_value(&src);
+ replace->get_value(&rpl);
str->length(0);
str->set_charset(collation.collation);