diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-04-09 16:18:33 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-04-09 16:18:33 +0200 |
| commit | 02c712aa546df8d6e9c285e6adc95309925673e3 (patch) | |
| tree | 8d6654dac2666dcd738db1f10dbd919610087795 /storage/archive/azlib.h | |
| parent | f6168bb67bb5cab0584809c876c674a92051b5d1 (diff) | |
| download | mariadb-git-02c712aa546df8d6e9c285e6adc95309925673e3.tar.gz | |
* frm extra2 segment.
* persistent table versions in the extra2
* ha_archive::frm_compare using TABLE_SHARE::tabledef_version
* distinguish between "important" and "optional" extra2 frm values
* write engine-defined attributes (aka "table options") to extra2, not to extra,
but still read from the old location, if they're found there.
Diffstat (limited to 'storage/archive/azlib.h')
| -rw-r--r-- | storage/archive/azlib.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/storage/archive/azlib.h b/storage/archive/azlib.h index 09f61afcd28..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; |