mirror of
https://github.com/MariaDB/server.git
synced 2026-04-28 11:15:33 +02:00
Merge with global tree
Fixed some found bugs in BIT fields Added more test cases for BIT fields and varchar include/my_base.h: Merge Added HA_BIT_PART for easier test in key.cc innobase/os/os0proc.c: Fixed typo myisam/mi_dbug.c: Add printing of BIT types when debugging mysql-test/r/show_check.result: Set 'Avg_row_length' to # as this value is different between 32 and 64 bit machines mysql-test/r/type_bit.result: More tests mysql-test/r/type_varchar.result: More tests mysql-test/t/show_check.test: Set 'Avg_row_length' to # as this value is different between 32 and 64 bit machines mysql-test/t/type_bit.test: More tests mysql-test/t/type_varchar.test: More tests sql/field.cc: Added Field::val_int_as_str() to get better logging of bit fields Merged new_key_field with move_field() to fix some problems with bit fields Fixed some bugs with bit fields sql/field.h: Added Field::val_int_as_str() to get better logging of bit fields Merged new_key_field with move_field() to fix some problems with bit fields Fixed some bugs with bit fields sql/ha_myisam.cc: Fixed problem with unintialized memory (not critical) sql/key.cc: Fix so that 'key_cmp_if_same' works with bit fields. sql/opt_range.cc: Move declarations first in function Nice printing of bit fields in debug log sql/sql_prepare.cc: Fixed old merge error (not critical) sql/sql_select.cc: Use new interface to new_key_field sql/sql_select.h: Use new interface to new_key_fields() This fixes a bug with BIT fields where the upper bit of the data was not stored in the key buffer sql/structs.h: Extend key_part_flag to be able to add HA_BIT_PART to it sql/table.cc: Mark BIT key parts with HA_BIT_PART to make test in key.cc simpler
This commit is contained in:
parent
3fa699ef04
commit
0690410310
19 changed files with 589 additions and 101 deletions
|
|
@ -74,7 +74,7 @@ typedef struct st_key_part_info { /* Info about a key part */
|
|||
uint16 store_length;
|
||||
uint16 key_type;
|
||||
uint16 fieldnr; /* Fieldnum in UNIREG */
|
||||
uint8 key_part_flag; /* 0 or HA_REVERSE_SORT */
|
||||
uint16 key_part_flag; /* 0 or HA_REVERSE_SORT */
|
||||
uint8 type;
|
||||
uint8 null_bit; /* Position to null_bit */
|
||||
} KEY_PART_INFO ;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue