diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/maria.h | 9 | ||||
| -rw-r--r-- | include/my_handler.h | 7 | ||||
| -rw-r--r-- | include/myisam.h | 2 |
3 files changed, 12 insertions, 6 deletions
diff --git a/include/maria.h b/include/maria.h index a8c5cbf794b..dc3df955850 100644 --- a/include/maria.h +++ b/include/maria.h @@ -54,8 +54,6 @@ extern "C" { #define MARIA_KEY_BLOCK_LENGTH 8192 /* default key block length */ #define MARIA_MIN_KEY_BLOCK_LENGTH 1024 /* Min key block length */ #define MARIA_MAX_KEY_BLOCK_LENGTH 32768 -#define maria_portable_sizeof_char_ptr 8 -#define MARIA_MAX_KEY_LENGTH 1000 /* Max length in bytes */ /* In the following macros '_keyno_' is 0 .. keys-1. @@ -150,6 +148,7 @@ typedef struct st_maria_create_info ulonglong auto_increment; ulonglong data_file_length; ulonglong key_file_length; + /* Size of null bitmap at start of row */ uint null_bytes; uint old_options; enum data_file_type org_data_file_type; @@ -226,11 +225,13 @@ typedef struct st_maria_columndef /* column information */ uint64 offset; /* Offset to position in row */ enum en_fieldtype type; uint16 length; /* length of field */ + /* Intern variable (size of total storage area for the row) */ uint16 fill_length; uint16 null_pos; /* Position for null marker */ uint16 empty_pos; /* Position for empty marker */ uint8 null_bit; /* If column may be NULL */ - uint8 empty_bit; /* If column may be empty */ + /* Intern. Set if column should be zero packed (part of empty_bits) */ + uint8 empty_bit; #ifndef NOT_PACKED_DATABASES void(*unpack)(struct st_maria_columndef *rec, @@ -246,7 +247,7 @@ typedef struct st_maria_columndef /* column information */ extern ulong maria_block_size; extern ulong maria_concurrent_insert; extern my_bool maria_flush, maria_single_user; -extern my_bool maria_delay_key_write, maria_delay_rec_write; +extern my_bool maria_delay_key_write; extern my_off_t maria_max_temp_length; extern ulong maria_bulk_insert_tree_size, maria_data_pointer_size; extern KEY_CACHE maria_key_cache_var, *maria_key_cache; diff --git a/include/my_handler.h b/include/my_handler.h index 72caf67398f..13dcd01a332 100644 --- a/include/my_handler.h +++ b/include/my_handler.h @@ -111,4 +111,11 @@ extern int ha_key_cmp(register HA_KEYSEG *keyseg, register uchar *a, extern HA_KEYSEG *ha_find_null(HA_KEYSEG *keyseg, uchar *a); +/* + Inside an in-memory data record, memory pointers to pieces of the + record (like BLOBs) are stored in their native byte order and in + this amount of bytes. +*/ +#define portable_sizeof_char_ptr 8 + #endif /* _my_handler_h */ diff --git a/include/myisam.h b/include/myisam.h index d6d6426adf7..d66dd54cf98 100644 --- a/include/myisam.h +++ b/include/myisam.h @@ -55,8 +55,6 @@ extern "C" { #define MI_MIN_KEY_BLOCK_LENGTH 1024 /* Min key block length */ #define MI_MAX_KEY_BLOCK_LENGTH 16384 -#define mi_portable_sizeof_char_ptr 8 - /* In the following macros '_keyno_' is 0 .. keys-1. If there can be more keys than bits in the key_map, the highest bit |