diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-09-28 17:55:28 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-09-28 17:55:28 +0200 |
| commit | 66d9696596edbc20ad36bf3d5bffb5595e8235c3 (patch) | |
| tree | bbef37c9a90b63d25bee59386cac04298a13846f /sql/parse_file.h | |
| parent | 66a58f46e937cdc3d7e0529b52ad8b658d9b2cd4 (diff) | |
| parent | 23af6f5942e7235a7c14a36cb8dd0d2796b5ef37 (diff) | |
| download | mariadb-git-66d9696596edbc20ad36bf3d5bffb5595e8235c3.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'sql/parse_file.h')
| -rw-r--r-- | sql/parse_file.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/parse_file.h b/sql/parse_file.h index e4756e6c8af..87917dbd71b 100644 --- a/sql/parse_file.h +++ b/sql/parse_file.h @@ -42,9 +42,9 @@ enum file_opt_type { struct File_option { - LEX_STRING name; /**< Name of the option */ - int offset; /**< offset to base address of value */ - file_opt_type type; /**< Option type */ + LEX_STRING name; /**< Name of the option */ + my_ptrdiff_t offset; /**< offset to base address of value */ + file_opt_type type; /**< Option type */ }; |