diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-04-09 15:45:31 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-04-09 15:45:31 +0200 |
| commit | e5a323e107767ceb5106b85d077d4ac9d2d37778 (patch) | |
| tree | 3ab2bf9c443c5476108d251ac6f9aa9623c2aac3 /storage/archive/azio.c | |
| parent | f532653c2920490ac15ad70db0f2f1aaaacb92fe (diff) | |
| download | mariadb-git-e5a323e107767ceb5106b85d077d4ac9d2d37778.tar.gz | |
single table discovery: handlerton::discover_table() method.
fixes for need_full_discover_for_existence mode
Diffstat (limited to 'storage/archive/azio.c')
| -rw-r--r-- | storage/archive/azio.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/archive/azio.c b/storage/archive/azio.c index 92d7ad70344..43c418e516d 100644 --- a/storage/archive/azio.c +++ b/storage/archive/azio.c @@ -855,7 +855,7 @@ int azclose (azio_stream *s) Though this was added to support MySQL's FRM file, anything can be stored in this location. */ -int azwrite_frm(azio_stream *s, char *blob, unsigned int length) +int azwrite_frm(azio_stream *s, uchar *blob, unsigned int length) { if (s->mode == 'r') return 1; @@ -867,7 +867,7 @@ int azwrite_frm(azio_stream *s, char *blob, unsigned int length) s->frm_length= length; s->start+= length; - if (my_pwrite(s->file, (uchar*) blob, s->frm_length, + if (my_pwrite(s->file, blob, s->frm_length, s->frm_start_pos, MYF(MY_NABP)) || write_header(s) || (my_seek(s->file, 0, MY_SEEK_END, MYF(0)) == MY_FILEPOS_ERROR)) @@ -876,9 +876,9 @@ int azwrite_frm(azio_stream *s, char *blob, unsigned int length) return 0; } -int azread_frm(azio_stream *s, char *blob) +int azread_frm(azio_stream *s, uchar *blob) { - return my_pread(s->file, (uchar*) blob, s->frm_length, + return my_pread(s->file, blob, s->frm_length, s->frm_start_pos, MYF(MY_NABP)) ? 1 : 0; } |