summaryrefslogtreecommitdiff
path: root/sql/slave.cc
diff options
context:
space:
mode:
authorStaale Smedseng <staale.smedseng@sun.com>2009-06-09 14:55:30 +0200
committerStaale Smedseng <staale.smedseng@sun.com>2009-06-09 14:55:30 +0200
commit9d67536fe8707f3ae8e615c352f8eb0313624d16 (patch)
tree6cee8c2084e348d45fc326e9557d2f4148c4ab1a /sql/slave.cc
parentdf2eb32bbdf67d2dc8516511637c8ff0db1c9d16 (diff)
downloadmariadb-git-9d67536fe8707f3ae8e615c352f8eb0313624d16.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/slave.cc')
-rw-r--r--sql/slave.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/slave.cc b/sql/slave.cc
index 88c19a04602..d90eb9d520c 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -1334,7 +1334,8 @@ static int init_strvar_from_file(char *var, int max_size, IO_CACHE *f,
up to and including newline.
*/
int c;
- while (((c=my_b_get(f)) != '\n' && c != my_b_EOF));
+ while (((c=my_b_get(f)) != '\n' && c != my_b_EOF))
+ {}
}
return 0;
}