diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-16 21:35:25 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-16 21:35:25 +0300 |
| commit | 7e15d855f1fbc72bae6c0ee75dd2b61477c2eaff (patch) | |
| tree | 6cc5a2304ff1d8e8e5da08709d43daa27a50e91f /sql/item_cmpfunc.cc | |
| parent | f1e83a4163458f7e25c709403cc7c7b48a7ef23e (diff) | |
| parent | c5e6a11e149600b3c454043706170fad4e7c6ce4 (diff) | |
| download | mariadb-git-7e15d855f1fbc72bae6c0ee75dd2b61477c2eaff.tar.gz | |
Manual merge from mysql-5.1.
Conflicts:
- mysql-test/r/select.result
- mysql-test/t/select.test
- sql/item_cmpfunc.h
- sql/sql_show.cc
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index d5a61ea4050..1d33e369af0 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -895,9 +895,9 @@ int Arg_comparator::set_cmp_func(Item_result_field *owner_arg, ulonglong const_value= (ulonglong)-1; thd= current_thd; owner= owner_arg; + set_null= set_null && owner_arg; a= a1; b= a2; - owner= owner_arg; thd= current_thd; if ((cmp_type= can_compare_as_dates(*a, *b, &const_value))) |