From c53cd1c0c9fd6395421870a1ed23dbdc27144f75 Mon Sep 17 00:00:00 2001 From: Gleb Shchepa Date: Sat, 26 Jun 2010 02:06:53 +0400 Subject: [PATCH] gcc warnings removal (after bugfix for bug 36569) --- sql/sql_select.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sql/sql_select.cc b/sql/sql_select.cc index d9b6bff0663..22190eeefed 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -9644,7 +9644,7 @@ test_if_equality_guarantees_uniqueness(Item *l, Item *r) static bool equal(Item *i1, Item *i2, Field *f2) { - DBUG_ASSERT(i2 == NULL ^ f2 == NULL); + DBUG_ASSERT((i2 == NULL) ^ (f2 == NULL)); if (i2 != NULL) return i1->eq(i2, 1); @@ -9674,7 +9674,7 @@ bool const_expression_in_where(COND *cond, Item *comp_item, Field *comp_field, Item **const_item) { - DBUG_ASSERT(comp_item == NULL ^ comp_field == NULL); + DBUG_ASSERT((comp_item == NULL) ^ (comp_field == NULL)); Item *intermediate= NULL; if (const_item == NULL)