diff options
| author | unknown <istruewing@stella.local> | 2008-03-26 10:27:00 +0100 |
|---|---|---|
| committer | unknown <istruewing@stella.local> | 2008-03-26 10:27:00 +0100 |
| commit | 03c110ea217b89c308b7f08c8eb400f47a074b2e (patch) | |
| tree | 69df040c98a9edd26de9be04066dff14eb50319e /strings | |
| parent | 2daa01682775d42bbe00d3fb41e0865079240de8 (diff) | |
| parent | a1de91e7082816f05bcafc2b321e5f82eb66054b (diff) | |
| download | mariadb-git-03c110ea217b89c308b7f08c8eb400f47a074b2e.tar.gz | |
Merge stella.local:/home2/mydev/mysql-5.1-amain
into stella.local:/home2/mydev/mysql-5.1-axmrg
mysql-test/r/ctype_big5.result:
Auto merged
mysql-test/r/ctype_euckr.result:
Auto merged
mysql-test/r/ctype_gb2312.result:
Auto merged
mysql-test/r/ctype_gbk.result:
Auto merged
mysql-test/r/ctype_uca.result:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/suite/binlog/r/binlog_row_ctype_cp932.result:
Auto merged
mysql-test/suite/binlog/r/binlog_stm_ctype_cp932.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/rpl_rli.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/lib/mtr_report.pl:
SCCS merged
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/strmake.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/strings/strmake.c b/strings/strmake.c index df8d78e8476..2d5fa5e36aa 100644 --- a/strings/strmake.c +++ b/strings/strmake.c @@ -41,9 +41,9 @@ char *strmake(register char *dst, register const char *src, size_t length) write a character rather than '\0' as this makes spotting these problems in the results easier. */ - uint n= strlen(src) + 1; - if (n <= length) - memset(dst + n, (int) 'Z', length - n + 1); + uint n= 0; + while (n < length && src[n++]); + memset(dst + n, (int) 'Z', length - n + 1); #endif while (length--) |