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 /include | |
| 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 'include')
| -rw-r--r-- | include/base64.h | 3 | ||||
| -rw-r--r-- | include/my_sys.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/base64.h b/include/base64.h index 4653e824a9a..a6bffebfe07 100644 --- a/include/base64.h +++ b/include/base64.h @@ -39,7 +39,8 @@ int base64_encode(const void *src, size_t src_len, char *dst); /* Decode a base64 string into data */ -int base64_decode(const char *src, size_t src_len, void *dst); +int base64_decode(const char *src, size_t src_len, + void *dst, const char **end_ptr); #ifdef __cplusplus diff --git a/include/my_sys.h b/include/my_sys.h index 4b31f6bcd2b..650204118b3 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -517,6 +517,7 @@ typedef int (*qsort2_cmp)(const void *, const void *, const void *); (uint) (*(info)->current_pos - (info)->request_pos)) /* tell write offset in the SEQ_APPEND cache */ +int my_b_copy_to_file(IO_CACHE *cache, FILE *file); my_off_t my_b_append_tell(IO_CACHE* info); my_off_t my_b_safe_tell(IO_CACHE* info); /* picks the correct tell() */ |