summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2017-05-11 07:27:11 +0400
committerAlexander Barkov <bar@mariadb.org>2017-05-11 07:29:43 +0400
commit7beb8ff27498c4b2955c4908f16ec9b9321b1bee (patch)
tree1ada64a46566657ad9e458873014e8953d1fcc92
parent533506b4edb5873dc25ae335dbd018da37235f2b (diff)
downloadmariadb-git-7beb8ff27498c4b2955c4908f16ec9b9321b1bee.tar.gz
A --ps cleanup for MDEV-12658 Make the third parameter to LPAD and RPAD optional
"mtr --ps func_str" failed: pad_str was erroneously appended with a new space on every PS execution. Adding pad_str.length(0) into fix_length_and_dec() to avoid this.
-rw-r--r--sql/item_strfunc.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index 64dcc6b65fa..ee5646bdfc5 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -3187,6 +3187,7 @@ void Item_func_pad::fix_length_and_dec()
if (agg_arg_charsets_for_string_result(collation, &args[0], 1, 1))
return;
pad_str.set_charset(collation.collation);
+ pad_str.length(0);
pad_str.append(" ", 1);
}