diff options
| author | Aleksey Midenkov <midenok@gmail.com> | 2017-12-15 15:01:13 +0300 |
|---|---|---|
| committer | Aleksey Midenkov <midenok@gmail.com> | 2017-12-15 15:18:59 +0300 |
| commit | 73606a3977cb4b76fa8205ca99ff7aedf4b8866c (patch) | |
| tree | 8cb4ba356ee9001fb496492932223f9d98807fc8 /include | |
| parent | 2ae2876a6ce4b1e4d4bb61d8f372feff1cb51339 (diff) | |
| parent | 2b67b7cb08bf163df3e02115ddc13d05dc966c03 (diff) | |
| download | mariadb-git-73606a3977cb4b76fa8205ca99ff7aedf4b8866c.tar.gz | |
System Versioning 1.0 pre5 [closes #407]
Merge branch '10.3' into trunk
Both field_visibility and VERS_HIDDEN_FLAG exist independently.
TODO:
VERS_HIDDEN_FLAG should be replaced with SYSTEM_INVISIBLE (or COMPLETELY_INVISIBLE?).
Diffstat (limited to 'include')
| -rw-r--r-- | include/ma_dyncol.h | 6 | ||||
| -rw-r--r-- | include/my_base.h | 3 | ||||
| -rw-r--r-- | include/mysql_com.h | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/include/ma_dyncol.h b/include/ma_dyncol.h index cb03ccb5382..300474e061e 100644 --- a/include/ma_dyncol.h +++ b/include/ma_dyncol.h @@ -63,6 +63,12 @@ typedef struct st_mysql_lex_string LEX_STRING; /* NO and OK is the same used just to show semantics */ #define ER_DYNCOL_NO ER_DYNCOL_OK +#ifdef HAVE_CHARSET_utf8mb4 +#define DYNCOL_UTF (&my_charset_utf8mb4_general_ci) +#else +#define DYNCOL_UTF (&my_charset_utf8_general_ci) +#endif + enum enum_dyncol_func_result { ER_DYNCOL_OK= 0, diff --git a/include/my_base.h b/include/my_base.h index 1e7cacd3426..71dca2e831a 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -282,7 +282,8 @@ enum ha_base_keytype { This flag can be calculated -- it's based on key lengths comparison. */ #define HA_KEY_HAS_PART_KEY_SEG 65536 - +/* Internal Flag Can be calcaluted */ +#define HA_INVISIBLE_KEY 2<<18 /* Automatic bits in key-flag */ #define HA_SPACE_PACK_USED 4 /* Test for if SPACE_PACK used */ diff --git a/include/mysql_com.h b/include/mysql_com.h index 12746b2001b..b8108782104 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -202,7 +202,7 @@ enum enum_indicator_type #define VERS_UPDATE_UNVERSIONED_FLAG (1 << 29) /* column that doesn't support system versioning when table itself supports it*/ -#define HIDDEN_FLAG (1 << 31) /* hide from SELECT * */ +#define VERS_HIDDEN_FLAG (1 << 31) /* hide from SELECT * */ #define REFRESH_GRANT (1ULL << 0) /* Refresh grant tables */ #define REFRESH_LOG (1ULL << 1) /* Start on new log file */ |