diff options
| author | Konstantin Osipov <kostja@sun.com> | 2009-08-12 17:11:06 +0400 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2009-08-12 17:11:06 +0400 |
| commit | b28f09bd8cf65a0ce7dbe8fb04033cdf7f9323ff (patch) | |
| tree | 93134a8ebdd911b1810c559d5ace514af1468eb8 /sql/handler.h | |
| parent | 1402275a53db6fc931739de46f88121924de1e02 (diff) | |
| download | mariadb-git-b28f09bd8cf65a0ce7dbe8fb04033cdf7f9323ff.tar.gz | |
A follow up patch for the follow up patch for Bug#45829
"CREATE TABLE TRANSACTIONAL PAGE_CHECKSUM ROW_FORMAT=PAGE accepted,
does nothing".
Put back stubs for members of structures that are shared between
sql/ and pluggable storage engines. to not break ABI unnecessarily.
To be NULL-merged into 5.4, where we do break the ABI already.
Diffstat (limited to 'sql/handler.h')
| -rw-r--r-- | sql/handler.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/handler.h b/sql/handler.h index 726926bcb46..f76f940fd37 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -895,6 +895,8 @@ class partition_info; struct st_partition_iter; #define NOT_A_PARTITION_ID ((uint32)-1) +enum enum_ha_unused { HA_CHOICE_UNDEF, HA_CHOICE_NO, HA_CHOICE_YES }; + typedef struct st_ha_create_information { CHARSET_INFO *table_charset, *default_table_charset; @@ -916,10 +918,12 @@ typedef struct st_ha_create_information uint options; /* OR of HA_CREATE_ options */ uint merge_insert_method; uint extra_size; /* length of extra data segment */ + enum enum_ha_unused unused1; bool table_existed; /* 1 in create if table existed */ bool frm_only; /* 1 if no ha_create_table() */ bool varchar; /* 1 if table has a VARCHAR */ enum ha_storage_media storage_media; /* DEFAULT, DISK or MEMORY */ + enum enum_ha_unused unused2; } HA_CREATE_INFO; |