summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorunknown <monty@work.mysql.com>2001-10-02 21:33:47 +0200
committerunknown <monty@work.mysql.com>2001-10-02 21:33:47 +0200
commit2e0dc69895280f3b407e56dace32ad9cf25ce356 (patch)
treed9089456ab1e47d6aaaaf6706de408fea79fe87e /strings
parent9b3d608ea7de5da60bd88765b4a52d316dffa708 (diff)
parentabf1b80cf457702fd883c3a17b1d9eaed1c7c6b6 (diff)
downloadmariadb-git-2e0dc69895280f3b407e56dace32ad9cf25ce356.tar.gz
merge
BitKeeper/etc/logging_ok: auto-union client/Makefile.am: Auto merged client/mysql.cc: Auto merged myisam/mi_check.c: Auto merged sql/slave.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_show.cc: Auto merged strings/strmake.c: Auto merged mysql-test/t/rpl000017-slave.sh: Auto merged
Diffstat (limited to 'strings')
-rw-r--r--strings/strmake.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/strings/strmake.c b/strings/strmake.c
index 6f02e4007c8..96f220c2984 100644
--- a/strings/strmake.c
+++ b/strings/strmake.c
@@ -22,7 +22,8 @@
strmake(dst,src,length) moves length characters, or until end, of src to
dst and appends a closing NUL to dst.
- strmake() returns pointer to closing null;
+ Note that is strlen(src) >= length then dst[length] will be set to \0
+ strmake() returns pointer to closing null
*/
#include <my_global.h>