summaryrefslogtreecommitdiff
path: root/sql/field.h
diff options
context:
space:
mode:
authorStaale Smedseng <staale.smedseng@sun.com>2009-06-09 18:11:21 +0200
committerStaale Smedseng <staale.smedseng@sun.com>2009-06-09 18:11:21 +0200
commitdae006c17fe4962c1f79060a10a1dc80dc07bf03 (patch)
tree193df6c7ac6afa01d015869845f23915230d1eaf /sql/field.h
parente43d8e584d76aa646dd0a88cbb4b85b20fffe37c (diff)
downloadmariadb-git-dae006c17fe4962c1f79060a10a1dc80dc07bf03.tar.gz
Bug #43414 Parenthesis (and other) warnings compiling MySQL
with gcc 4.3.2 Compiling MySQL with gcc 4.3.2 and later produces a number of warnings, many of which are new with the recent compiler versions. This bug will be resolved in more than one patch to limit the size of changesets. This is the first patch, fixing a number of the warnings, predominantly "suggest using parentheses around && in ||", and empty for and while bodies.
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 2975719a591..eef3618a142 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -170,7 +170,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; }