diff options
| author | monty@mysql.com <> | 2003-11-21 01:53:01 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2003-11-21 01:53:01 +0200 |
| commit | 8aeb63dd3bc0a7c7ec1cda701f721591929c41e3 (patch) | |
| tree | d2ee92d6c747460f67b4e5c5612f5771fbc5e4c0 /include | |
| parent | 32a62d506916c2f1ee34cb4494a10b66d1b4be2a (diff) | |
| download | mariadb-git-8aeb63dd3bc0a7c7ec1cda701f721591929c41e3.tar.gz | |
Update VC++ files
Portability fixes
After merge fixes
Diffstat (limited to 'include')
| -rw-r--r-- | include/keycache.h | 3 | ||||
| -rw-r--r-- | include/m_ctype.h | 8 | ||||
| -rw-r--r-- | include/my_base.h | 1 |
3 files changed, 8 insertions, 4 deletions
diff --git a/include/keycache.h b/include/keycache.h index 824c5874ffc..340ab881fee 100644 --- a/include/keycache.h +++ b/include/keycache.h @@ -91,9 +91,6 @@ typedef struct st_key_cache ulong global_cache_read; /* number of reads from files to the cache */ int blocks; /* max number of blocks in the cache */ my_bool in_init; /* Set to 1 in MySQL during init/resize */ - - /* optional call back function */ - void (*action)(struct st_key_cache *); } KEY_CACHE; /* The default key cache */ diff --git a/include/m_ctype.h b/include/m_ctype.h index e2b2f7f1668..0228b359111 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.h @@ -335,6 +335,14 @@ uint my_instr_mb(struct charset_info_st *, extern my_bool my_parse_charset_xml(const char *bug, uint len, int (*add)(CHARSET_INFO *cs)); +#undef _U +#undef _L +#undef _NMR +#undef _SPC +#undef _PNT +#undef _CTR +#undef _B +#undef _X #define _U 01 /* Upper case */ #define _L 02 /* Lower case */ diff --git a/include/my_base.h b/include/my_base.h index 1bd0f47afa4..25521d7b13d 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -46,7 +46,6 @@ #define HA_OPEN_DELAY_KEY_WRITE 8 /* Don't update index */ #define HA_OPEN_ABORT_IF_CRASHED 16 #define HA_OPEN_FOR_REPAIR 32 /* open even if crashed */ -#define HA_OPEN_TO_ASSIGN 64 /* Open for key cache assignment */ /* The following is parameter to ha_rkey() how to use key */ |