diff options
author | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2007-01-18 15:28:45 +0400 |
---|---|---|
committer | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2007-01-18 15:28:45 +0400 |
commit | 368d6b2794040a02911dbc9a358575e930691596 (patch) | |
tree | 663010eb6e8e69295efc65591380f0f2a0e3864f /sql | |
parent | 7c5a417a4e117358c08a2b40f39c901f58b4c5e2 (diff) | |
download | mariadb-git-368d6b2794040a02911dbc9a358575e930691596.tar.gz |
after merge fix.
Diffstat (limited to 'sql')
-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 ec97bc92d24..41b30111488 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -7865,6 +7865,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) @@ -8104,6 +8105,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, table_arg) { + flags|= UNSIGNED_FLAG; bit_len= 0; bytes_in_rec= (len_arg + 7) / 8; } |