diff options
| author | unknown <sergefp@mysql.com> | 2004-06-14 11:18:56 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2004-06-14 11:18:56 +0400 |
| commit | e851a009d4381972895e1d687e6f1448d83e1753 (patch) | |
| tree | cb100affefa471904e7555d307bab15072bae4f6 /include | |
| parent | 05165962e7df2753d9dc8ce052a3a325a94dd469 (diff) | |
| parent | 40e65508792422e896dad764f3901c7e5971a132 (diff) | |
| download | mariadb-git-e851a009d4381972895e1d687e6f1448d83e1753.tar.gz | |
Manual merge
include/my_base.h:
Auto merged
include/my_bitmap.h:
Auto merged
include/my_sys.h:
Auto merged
innobase/include/row0mysql.h:
Auto merged
innobase/row/row0sel.c:
Auto merged
mysys/my_bitmap.c:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_berkeley.h:
Auto merged
sql/ha_heap.h:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/handler.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/opt_range.h:
Auto merged
sql/sql_select.h:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_base.h | 8 | ||||
| -rw-r--r-- | include/my_bitmap.h | 2 | ||||
| -rw-r--r-- | include/my_sys.h | 1 |
3 files changed, 10 insertions, 1 deletions
diff --git a/include/my_base.h b/include/my_base.h index f912cb4278c..dd8918da858 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -146,7 +146,13 @@ enum ha_extra_function { On-the-fly switching between unique and non-unique key inserting. */ HA_EXTRA_CHANGE_KEY_TO_UNIQUE, - HA_EXTRA_CHANGE_KEY_TO_DUP + HA_EXTRA_CHANGE_KEY_TO_DUP, + /* + When using HA_EXTRA_KEYREAD, overwrite only key member fields and keep + other fields intact. When this is off (by default) InnoDB will use memcpy + to overwrite entire row. + */ + HA_EXTRA_KEYREAD_PRESERVE_FIELDS }; /* The following is parameter to ha_panic() */ diff --git a/include/my_bitmap.h b/include/my_bitmap.h index a4511bf3414..fb1c3c69563 100644 --- a/include/my_bitmap.h +++ b/include/my_bitmap.h @@ -46,6 +46,8 @@ extern my_bool bitmap_is_set(const MY_BITMAP *map, uint bitmap_bit); extern my_bool bitmap_is_set_all(const MY_BITMAP *map); extern my_bool bitmap_is_subset(const MY_BITMAP *map1, const MY_BITMAP *map2); extern uint bitmap_set_next(MY_BITMAP *map); +extern uint bitmap_get_first(const MY_BITMAP *map); +extern uint bitmap_bits_set(const MY_BITMAP *map); extern void bitmap_clear_all(MY_BITMAP *map); extern void bitmap_clear_bit(MY_BITMAP *map, uint bitmap_bit); extern void bitmap_free(MY_BITMAP *map); diff --git a/include/my_sys.h b/include/my_sys.h index e05df3b6a07..0cfad5750c1 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -748,6 +748,7 @@ extern byte *my_compress_alloc(const byte *packet, ulong *len, ulong *complen); extern ha_checksum my_checksum(ha_checksum crc, const byte *mem, uint count); extern uint my_bit_log2(ulong value); extern uint my_count_bits(ulonglong v); +extern uint my_count_bits_ushort(ushort v); extern void my_sleep(ulong m_seconds); extern ulong crc32(ulong crc, const uchar *buf, uint len); extern uint my_set_max_open_files(uint files); |