summaryrefslogtreecommitdiff
path: root/sql/sql_db.cc
diff options
context:
space:
mode:
authorStaale Smedseng <staale.smedseng@sun.com>2009-09-23 15:21:29 +0200
committerStaale Smedseng <staale.smedseng@sun.com>2009-09-23 15:21:29 +0200
commit8b9843408d8b1068798228f397cd1a20fa56f504 (patch)
treebe24d592bff31a5a07c28cb307d81ed4f01b925a /sql/sql_db.cc
parent613297ff1e66a0fcf517e4e1bcf2a573d2e2c815 (diff)
downloadmariadb-git-8b9843408d8b1068798228f397cd1a20fa56f504.tar.gz
Bug #43414 Parenthesis (and other) warnings compiling MySQL
with gcc 4.3.2 Cleaning up warnings not present in 5.0.
Diffstat (limited to 'sql/sql_db.cc')
-rw-r--r--sql/sql_db.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc
index bcc8fcf54fc..c19bfba9fc1 100644
--- a/sql/sql_db.cc
+++ b/sql/sql_db.cc
@@ -1450,11 +1450,11 @@ cmp_db_names(const char *db1_name,
{
return
/* db1 is NULL and db2 is NULL */
- !db1_name && !db2_name ||
+ (!db1_name && !db2_name) ||
/* db1 is not-NULL, db2 is not-NULL, db1 == db2. */
- db1_name && db2_name &&
- my_strcasecmp(system_charset_info, db1_name, db2_name) == 0;
+ (db1_name && db2_name &&
+ my_strcasecmp(system_charset_info, db1_name, db2_name) == 0);
}