diff options
| author | unknown <ramil/ram@myoffice.izhnet.ru> | 2007-01-18 15:59:40 +0400 |
|---|---|---|
| committer | unknown <ramil/ram@myoffice.izhnet.ru> | 2007-01-18 15:59:40 +0400 |
| commit | 29d9e91478f07988d3e1f5ab60514751cb8bb439 (patch) | |
| tree | 605b91cc4bb432f46802020c94544f0e960f25fa /sql/field.cc | |
| parent | 84b51f9f8fcc06d6e51b263ad72cdcc22e04a9b6 (diff) | |
| parent | 368d6b2794040a02911dbc9a358575e930691596 (diff) | |
| download | mariadb-git-29d9e91478f07988d3e1f5ab60514751cb8bb439.tar.gz | |
Merge mysql.com:/usr/home/ram/work/bug22533/my50-bug22533
into mysql.com:/usr/home/ram/work/bug22533/my51-bug22533
mysql-test/r/range.result:
Auto merged
mysql-test/r/type_bit.result:
Auto merged
mysql-test/r/type_bit_innodb.result:
Auto merged
sql/field.cc:
Auto merged
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/field.cc b/sql/field.cc index 1e42a53e45a..01811394e38 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -8166,6 +8166,7 @@ Field_bit::Field_bit(char *ptr_arg, uint32 len_arg, uchar *null_ptr_arg, bit_ptr(bit_ptr_arg), bit_ofs(bit_ofs_arg), bit_len(len_arg & 7), bytes_in_rec(len_arg / 8) { + flags|= UNSIGNED_FLAG; /* Ensure that Field::eq() can distinguish between two different bit fields. (two bit fields that are not null, may have same ptr and null_ptr) @@ -8472,6 +8473,7 @@ Field_bit_as_char::Field_bit_as_char(char *ptr_arg, uint32 len_arg, :Field_bit(ptr_arg, len_arg, null_ptr_arg, null_bit_arg, 0, 0, unireg_check_arg, field_name_arg) { + flags|= UNSIGNED_FLAG; bit_len= 0; bytes_in_rec= (len_arg + 7) / 8; } |