diff options
| author | unknown <monty@narttu.mysql.fi> | 2007-04-19 16:22:58 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2007-04-19 16:22:58 +0300 |
| commit | ac0f98dd5e361f38767a89bb4623f250db8fb889 (patch) | |
| tree | 592e449197e637225e5da8a20d5b725c4f5f12dc /include/maria.h | |
| parent | ee8f8dd128ffa6fae5270918154526039b8eb80c (diff) | |
| parent | eb7d9500a9909ce594c4d169e70fb5cecbb33e2b (diff) | |
| download | mariadb-git-ac0f98dd5e361f38767a89bb4623f250db8fb889.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-maria
into mysql.com:/home/my/mysql-maria
include/maria.h:
Auto merged
storage/maria/ha_maria.cc:
Auto merged
storage/maria/ma_bitmap.c:
Auto merged
storage/maria/ma_check.c:
Auto merged
storage/maria/ma_dynrec.c:
Auto merged
storage/maria/ma_info.c:
Auto merged
storage/maria/ma_open.c:
Auto merged
storage/maria/ma_packrec.c:
Auto merged
storage/maria/ma_page.c:
Auto merged
storage/maria/ma_test1.c:
Auto merged
storage/maria/ma_test2.c:
Auto merged
storage/maria/ma_write.c:
Auto merged
storage/maria/maria_chk.c:
Auto merged
storage/maria/maria_pack.c:
Auto merged
storage/maria/ma_blockrec.c:
Manual merge
storage/maria/ma_close.c:
Manual merge
storage/maria/maria_def.h:
Manual merge
Diffstat (limited to 'include/maria.h')
| -rw-r--r-- | include/maria.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/maria.h b/include/maria.h index dab578e6ec7..2e36a3c50ca 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 PAGECACHE maria_pagecache_var, *maria_pagecache; |