summaryrefslogtreecommitdiff
path: root/sql/sql_string.h
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2022-08-09 09:57:13 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2022-08-09 09:57:13 +0200
commit22d455612b0abbb4b9f527e61348d4c6336b59d5 (patch)
treed39436232e232c5a5beb996e86e2b34b05ab5115 /sql/sql_string.h
parentbfdc4ff22ecf626eb46479e1a0dc1049d61a8d78 (diff)
parent75d631f333544de4487a6dd251d6f361e1d55d6b (diff)
downloadmariadb-git-22d455612b0abbb4b9f527e61348d4c6336b59d5.tar.gz
Merge branch '10.8' into 10.9
Diffstat (limited to 'sql/sql_string.h')
-rw-r--r--sql/sql_string.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h
index 795f80c3e08..a8c29eba22c 100644
--- a/sql/sql_string.h
+++ b/sql/sql_string.h
@@ -695,7 +695,7 @@ public:
Note that if arg_length == Alloced_length then we don't allocate.
This ensures we don't do any extra allocations in protocol and String:int,
- but the string will not be atomically null terminated if c_ptr() is not
+ but the string will not be automatically null terminated if c_ptr() is not
called.
*/
if (arg_length <= Alloced_length && Alloced_length)