summaryrefslogtreecommitdiff
path: root/sql/field.h
diff options
context:
space:
mode:
authorDavi Arnaut <Davi.Arnaut@Sun.COM>2008-12-16 10:12:22 -0200
committerDavi Arnaut <Davi.Arnaut@Sun.COM>2008-12-16 10:12:22 -0200
commit3ce026ec2f66a73be82a26055dd4761479a73811 (patch)
treec93d4234e3d8d278b91319b97e252f86a083eb0d /sql/field.h
parent0772b6a833a33304c753b7afa9b58b6b6c8f6464 (diff)
downloadmariadb-git-3ce026ec2f66a73be82a26055dd4761479a73811.tar.gz
Fix warnings and bug spotted by gcc-4.3.
Related to operator precedence and associativity. Make the expressions as explicit as possible. sql/field.h: Silence gcc-4.3 warning: be more explicit. sql/item.cc: Silence gcc-4.3 warning: be more explicit. sql/item_sum.cc: Silence gcc-4.3 warning: be more explicit. sql/log_event.cc: Silence gcc-4.3 warning: be more explicit. sql/spatial.h: Silence gcc-4.3 warning: be more explicit. sql/sql_lex.cc: Silence gcc-4.3 warning: be more explicit. sql/table.h: Silence gcc-4.3 warning: be more explicit. storage/federated/ha_federated.cc: Fix operator precedence bug. storage/heap/ha_heap.cc: Silence gcc-4.3 warning: be more explicit.
Diffstat (limited to 'sql/field.h')
-rw-r--r--sql/field.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.h b/sql/field.h
index 81905cc64ae..23033e6cc7a 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -209,7 +209,7 @@ public:
memcpy(ptr, ptr + l_offset, pack_length());
if (null_ptr)
*null_ptr= ((*null_ptr & (uchar) ~null_bit) |
- null_ptr[l_offset] & null_bit);
+ (null_ptr[l_offset] & null_bit));
}
virtual bool binary() const { return 1; }
virtual bool zero_pack() const { return 1; }