diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-03-17 15:05:04 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-03-17 15:05:04 +0200 |
| commit | b0b315dce3d961e5b29830dfafdff6bc4e58aaa0 (patch) | |
| tree | 7762c42e75102f122a8c9f5423ed0b676d5430a4 /sql/sql_select.cc | |
| parent | a821703912e84b6be1f0a686f27e1c81a0040ff8 (diff) | |
| download | mariadb-git-b0b315dce3d961e5b29830dfafdff6bc4e58aaa0.tar.gz | |
After merge fixes
Don't create temporary objects with no table name
myisam/mi_open.c:
After merge fix
mysql-test/r/analyse.result:
After merge fix
mysql-test/r/backup.result:
After merge fix
mysql-test/r/create.result:
After merge fix
mysql-test/r/delete.result:
After merge fix
mysql-test/r/func_like.result:
After merge fix
mysql-test/r/innodb.result:
After merge fix
mysql-test/r/rpl_loaddatalocal.result:
After merge fix
mysql-test/r/type_timestamp.result:
After merge fix
mysql-test/t/delete.test:
Change to not use table 't'
sql/sql_class.h:
Remove usage of thd when creating 'Table_ident'
Don't create temporary objects with no table name
sql/sql_derived.cc:
Indentation fix
sql/sql_select.cc:
After merge fix
Fixed wrong return -> DBUG_RETURN()
sql/sql_yacc.yy:
Remove usage of thd when creating 'Table_ident'
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 50c666ab64e..987857fd61b 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -1275,7 +1275,7 @@ JOIN::cleanup(THD *thd) } } tmp_join->tmp_join= 0; - return tmp_join->cleanup(thd); + DBUG_RETURN(tmp_join->cleanup(thd)); } @@ -3812,7 +3812,7 @@ remove_eq_conds(COND *cond,Item::cond_result *cond_value) } } if (should_fix_fields) - cond->fix_fields(current_thd,0); + cond->fix_fields(current_thd,0, &cond); if (!((Item_cond*) cond)->argument_list()->elements || *cond_value != Item::COND_OK) |