diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-04-15 15:09:22 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-04-15 15:09:22 +0200 |
| commit | a9035be5b7a7b3865ddb4ef34a5d0cfc65dfc254 (patch) | |
| tree | a9df7341e91623f62fe37cd47fce139d8888fc95 /storage/archive/azlib.h | |
| parent | 3a1c91d87d69ef243b3e78be6089102cafef0a8e (diff) | |
| parent | f57ecb7786177e0af3b1e3ec94302720b2e0f967 (diff) | |
| download | mariadb-git-a9035be5b7a7b3865ddb4ef34a5d0cfc65dfc254.tar.gz | |
10.0-base merge
Diffstat (limited to 'storage/archive/azlib.h')
| -rw-r--r-- | storage/archive/azlib.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/storage/archive/azlib.h b/storage/archive/azlib.h index 29a6329fb0a..2971705b2f1 100644 --- a/storage/archive/azlib.h +++ b/storage/archive/azlib.h @@ -198,6 +198,7 @@ extern "C" { #define AZ_BUFSIZE_READ 32768 #define AZ_BUFSIZE_WRITE 16384 +#define AZ_FRMVER_LEN 16 /* same as MY_UUID_SIZE in 10.0.2 */ typedef struct azio_stream { z_stream stream; @@ -227,6 +228,8 @@ typedef struct azio_stream { unsigned char dirty; /* State of file */ unsigned int frm_start_pos; /* Position for start of FRM */ unsigned int frm_length; /* Position for start of FRM */ + unsigned char frmver[AZ_FRMVER_LEN]; + unsigned int frmver_length; unsigned int comment_start_pos; /* Position for start of comment */ unsigned int comment_length; /* Position for start of comment */ } azio_stream; @@ -331,8 +334,8 @@ extern int azclose(azio_stream *file); error number (see function gzerror below). */ -extern int azwrite_frm (azio_stream *s, char *blob, unsigned int length); -extern int azread_frm (azio_stream *s, char *blob); +extern int azwrite_frm (azio_stream *s, const uchar *blob, unsigned int length); +extern int azread_frm (azio_stream *s, uchar *blob); extern int azwrite_comment (azio_stream *s, char *blob, unsigned int length); extern int azread_comment (azio_stream *s, char *blob); |