summaryrefslogtreecommitdiff
path: root/sql/item_sum.cc
diff options
context:
space:
mode:
authorbell@sanja.is.com.ua <>2005-11-20 20:47:07 +0200
committerbell@sanja.is.com.ua <>2005-11-20 20:47:07 +0200
commit806f9e24ff1e9409d6b833c4ec1c07d3e45272c3 (patch)
tree178b80a009c667cc88b5c83cbe9636892d375946 /sql/item_sum.cc
parentb13dd4ff72b55b0f015d181d99a48828017f2797 (diff)
downloadmariadb-git-806f9e24ff1e9409d6b833c4ec1c07d3e45272c3.tar.gz
Inefficient usage of String::append() fixed.
Bad examples of usage of a string with its length fixed. The incorrect length in the trigger file configuration descriptor fixed (BUG#14090). A hook for unknown keys added to the parser to support old .TRG files.
Diffstat (limited to 'sql/item_sum.cc')
-rw-r--r--sql/item_sum.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index b2eaf39d624..506d2a16108 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -3156,9 +3156,9 @@ String* Item_func_group_concat::val_str(String* str)
void Item_func_group_concat::print(String *str)
{
- str->append("group_concat(", 13);
+ str->append(STRING_WITH_LEN("group_concat("));
if (distinct)
- str->append("distinct ", 9);
+ str->append(STRING_WITH_LEN("distinct "));
for (uint i= 0; i < arg_count_field; i++)
{
if (i)
@@ -3167,19 +3167,19 @@ void Item_func_group_concat::print(String *str)
}
if (arg_count_order)
{
- str->append(" order by ", 10);
+ str->append(STRING_WITH_LEN(" order by "));
for (uint i= 0 ; i < arg_count_order ; i++)
{
if (i)
str->append(',');
(*order[i]->item)->print(str);
if (order[i]->asc)
- str->append(" ASC");
+ str->append(STRING_WITH_LEN(" ASC"));
else
- str->append(" DESC");
+ str->append(STRING_WITH_LEN(" DESC"));
}
}
- str->append(" separator \'", 12);
+ str->append(STRING_WITH_LEN(" separator \'"));
str->append(*separator);
- str->append("\')", 2);
+ str->append(STRING_WITH_LEN("\')"));
}