database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

gcc warnings removal (after bugfix for bug 36569)

Browse Source
This commit is contained in:
Gleb Shchepa
2010-06-26 02:06:53 +04:00
parent 8f521b41ba
commit c53cd1c0c9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_select.cc
View File

@ -9644,7 +9644,7 @@ test_if_equality_guarantees_uniqueness(Item *l, Item *r)
static bool equal(Item *i1, Item *i2, Field *f2) static bool equal(Item *i1, Item *i2, Field *f2)
{ {
DBUG_ASSERT(i2 == NULL ^ f2 == NULL); DBUG_ASSERT((i2 == NULL) ^ (f2 == NULL));
if (i2 != NULL) if (i2 != NULL)
return i1->eq(i2, 1); return i1->eq(i2, 1);
@ -9674,7 +9674,7 @@ bool
const_expression_in_where(COND *cond, Item *comp_item, Field *comp_field, const_expression_in_where(COND *cond, Item *comp_item, Field *comp_field,
Item **const_item) Item **const_item)
{ {
DBUG_ASSERT(comp_item == NULL ^ comp_field == NULL); DBUG_ASSERT((comp_item == NULL) ^ (comp_field == NULL));
Item *intermediate= NULL; Item *intermediate= NULL;
if (const_item == NULL) if (const_item == NULL)