summaryrefslogtreecommitdiff
path: root/sql/sql_partition.cc
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2018-01-19 19:56:34 +0200
committerMonty <monty@mariadb.org>2018-01-30 21:33:56 +0200
commit486c86dd391546fcd181cf4767768b2ee4986ef2 (patch)
treef9090e39c73b4aed58b3c063e9c23880338c167f /sql/sql_partition.cc
parentf55dc7f733446a201e3b465ae03a0388d192a3ad (diff)
downloadmariadb-git-486c86dd391546fcd181cf4767768b2ee4986ef2.tar.gz
Added some checking that LEX_CSTRING is \0 terminated
- When adding LEX_CSTRING to String, we are now checking that string is \0 terminated (as normally LEX_CSTRING should be usable for printf(). In the cases when one wants to avoid the checking one can use String->append(ptr, length) instead of just String->append(LEX_CSTRING*)
Diffstat (limited to 'sql/sql_partition.cc')
-rw-r--r--sql/sql_partition.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc
index 09b6331986e..9b5f6ebc7df 100644
--- a/sql/sql_partition.cc
+++ b/sql/sql_partition.cc
@@ -7217,7 +7217,7 @@ void append_row_to_str(String &str, const uchar *row, TABLE *table)
{
Field *field= *field_ptr;
str.append(" ");
- str.append(field->field_name);
+ str.append(&field->field_name);
str.append(":");
field_unpack(&str, field, rec, 0, false);
}