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.h | |
| 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.h')
| -rw-r--r-- | sql/item_cmpfunc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index 980b839aa41..f498873a7ad 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -57,10 +57,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); |