summaryrefslogtreecommitdiff
path: root/sql/table.cc
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <vicentiu@mariadb.org>2017-12-20 12:51:57 +0200
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2017-12-20 12:51:57 +0200
commit042f763268c0f209e7c12e0a6a72bb5d204dfe29 (patch)
tree7ee15ab50af97cab4135f3712f95ac12fafc74c5 /sql/table.cc
parentcb121a047b55403fe271570c928fd95ed64a1c8f (diff)
parent924db8b4ed3f268cbe91a1734611f4dc2311c7be (diff)
downloadmariadb-git-042f763268c0f209e7c12e0a6a72bb5d204dfe29.tar.gz
Merge remote-tracking branch '5.5' into 10.0
Diffstat (limited to 'sql/table.cc')
-rw-r--r--sql/table.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/table.cc b/sql/table.cc
index 38a64348937..4228860c612 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -6123,6 +6123,14 @@ void TABLE::create_key_part_by_field(KEY_PART_INFO *key_part_info,
might be reused.
*/
key_part_info->store_length= key_part_info->length;
+ /*
+ For BIT fields null_bit is not set to 0 even if the field is defined
+ as NOT NULL, look at Field_bit::Field_bit
+ */
+ if (!field->real_maybe_null())
+ {
+ key_part_info->null_bit= 0;
+ }
/*
The total store length of the key part is the raw length of the field +