diff options
| author | unknown <mats@romeo.(none)> | 2006-10-06 15:31:05 +0200 |
|---|---|---|
| committer | unknown <mats@romeo.(none)> | 2006-10-06 15:31:05 +0200 |
| commit | 5e81d1301e375fc903466df025d1f9f22a3b0994 (patch) | |
| tree | bacce208c70954e5ab55bde5d8e31391840ead28 /unittest | |
| parent | cc4435ad8fb8037f8e6353655d2342ec25fbd207 (diff) | |
| parent | d8be3113351929f12e4277f4306a1428a280d970 (diff) | |
| download | mariadb-git-5e81d1301e375fc903466df025d1f9f22a3b0994.tar.gz | |
Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
into romeo.(none):/home/bk/b19459-mysql-5.1-new
client/mysqlbinlog.cc:
Auto merged
include/my_sys.h:
Auto merged
mysys/base64.c:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
sql/share/errmsg.txt:
SCCS merged
Diffstat (limited to 'unittest')
| -rw-r--r-- | unittest/mysys/base64-t.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unittest/mysys/base64-t.c b/unittest/mysys/base64-t.c index 6d85964b20d..ccec0c77086 100644 --- a/unittest/mysys/base64-t.c +++ b/unittest/mysys/base64-t.c @@ -54,7 +54,7 @@ main(void) /* Decode */ dst= (char *) malloc(base64_needed_decoded_length(strlen(str))); - dst_len= base64_decode(str, strlen(str), dst); + dst_len= base64_decode(str, strlen(str), dst, NULL); ok(dst_len == src_len, "Comparing lengths"); cmp= memcmp(src, dst, src_len); |