diff options
| author | unknown <monty@mysql.com> | 2004-03-25 22:11:22 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-03-25 22:11:22 +0200 |
| commit | 054d2de499625fac668cff166af605a8106b8eaf (patch) | |
| tree | 36abf1d40f08cd21cd81f6d5966b89ab4e995ac6 /sql/sql_select.cc | |
| parent | d78cb8998133d98b595b791379b9d1424c103962 (diff) | |
| download | mariadb-git-054d2de499625fac668cff166af605a8106b8eaf.tar.gz | |
Cleanups & safety fixes
include/mysql.h:
cleanup of load data infile patch
libmysql/libmysql.c:
cleanup of load data infile patch
myisam/mi_search.c:
Added missing assert.h
mysql-test/r/func_time.result:
Make test more secure
mysql-test/t/func_time.test:
Make test more secure
sql/item.cc:
restore to use str_value in item::save_in_field
sql/item.h:
Simple cleanup
sql/item_cmpfunc.cc:
Safety fix
sql/item_cmpfunc.h:
Simple optimization
sql/item_func.cc:
Updated comment
sql/sql_base.cc:
Simple optimization
sql/sql_select.cc:
Simple optimization
sql/sql_union.cc:
safey fixes
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 94bedd9bfa2..34bfabd845f 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -3536,7 +3536,7 @@ make_join_select(JOIN *join,SQL_SELECT *select,COND *cond) { /* Join with outer join condition */ COND *orig_cond=sel->cond; - sel->cond=and_conds(sel->cond, tab->on_expr, 0); + sel->cond=and_conds(join->thd, sel->cond, tab->on_expr, 0); if (sel->test_quick_select(join->thd, tab->keys, used_tables & ~ current_map, (join->select_options & |