diff options
| author | Georgi Kodinov <joro@sun.com> | 2010-01-13 12:28:42 +0200 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2010-01-13 12:28:42 +0200 |
| commit | 6e72f4171fbc157885672ab45152564cdd3d1bfa (patch) | |
| tree | cbdb25a3a54a2e4391cb90fb8e08590f44d099c8 /sql | |
| parent | 4dc7be62a997a0176e300878d4b5e93865606029 (diff) | |
| parent | 23a3b911409ee7c27937a663ed7a08e13c0adbed (diff) | |
| download | mariadb-git-6e72f4171fbc157885672ab45152564cdd3d1bfa.tar.gz | |
merge 5.1-main to 5.1-bugteam
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_cmpfunc.cc | 2 | ||||
| -rw-r--r-- | sql/item_cmpfunc.h | 4 |
2 files changed, 3 insertions, 3 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))) diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index f04fcd73b2e..38025ff0af5 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -54,10 +54,10 @@ public: /* Allow owner function to use string buffers. */ String value1, value2; - Arg_comparator(): thd(0), a_cache(0), b_cache(0), set_null(0), + Arg_comparator(): thd(0), a_cache(0), b_cache(0), set_null(TRUE), get_value_a_func(0), get_value_b_func(0) {}; Arg_comparator(Item **a1, Item **a2): a(a1), b(a2), thd(0), - a_cache(0), b_cache(0), set_null(0), + a_cache(0), b_cache(0), set_null(TRUE), get_value_a_func(0), get_value_b_func(0) {}; int set_compare_func(Item_result_field *owner, Item_result type); |