diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-11-11 15:57:35 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-11-11 15:57:35 +0200 |
| commit | 3165440cdec9d1270a2101973cb75e67e334dc5c (patch) | |
| tree | af6d24e40719efd42eef9d7580ef497455ddd45d /sql/sql_base.cc | |
| parent | 1b6548d54d6d649c068a73c8550e75ddb26bfd00 (diff) | |
| download | mariadb-git-3165440cdec9d1270a2101973cb75e67e334dc5c.tar.gz | |
Fixed that NULL and 0 returns 0 instead of NULL
This is coded to not cause a speed impact on top level AND expressions where we don't care if an AND expression returns 0 or NULL
mysql-test/r/bdb.result:
Fix results after serges last patch
mysql-test/r/innodb.result:
Fix results after serges last patch
mysql-test/r/null.result:
Update for new AND handling of NULL
scripts/mysqld_safe.sh:
Fix 'isroot' test to work even if user is not root
sql/item.h:
Fixed that NULL and 0 returns 0 instead of NULL
sql/item_cmpfunc.cc:
Fixed that NULL and 0 returns 0 instead of NULL
sql/item_cmpfunc.h:
Fixed that NULL and 0 returns 0 instead of NULL
sql/sql_base.cc:
Fixed that NULL and 0 returns 0 instead of NULL
sql/sql_parse.cc:
Fixed that NULL and 0 returns 0 instead of NULL
sql/sql_select.cc:
Fixed that NULL and 0 returns 0 instead of NULL
sql/sql_yacc.yy:
Fixed that NULL and 0 returns 0 instead of NULL
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index cf41d851137..42d35c05f23 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -1976,6 +1976,7 @@ int setup_conds(THD *thd,TABLE_LIST *tables,COND **conds) Item_cond_and *cond_and=new Item_cond_and(); if (!cond_and) // If not out of memory DBUG_RETURN(1); + cond_and->top_level_item(); uint i,j; for (i=0 ; i < t1->fields ; i++) |