diff options
author | Alexander Nozdrin <alik@sun.com> | 2009-12-16 21:37:10 +0300 |
---|---|---|
committer | Alexander Nozdrin <alik@sun.com> | 2009-12-16 21:37:10 +0300 |
commit | 7f6a62ef927ed117ebab2c6821a046851cd58b8f (patch) | |
tree | a8b8a50c43781b76121b7d28f0daca1a51cbbdf4 /sql/item_cmpfunc.h | |
parent | 09942fe8e89778e8b9ab99a8f0aa941a7fc95b16 (diff) | |
parent | 99a0a3b947aea6a74228376cd1d358526d9ebe2e (diff) | |
download | mariadb-git-7f6a62ef927ed117ebab2c6821a046851cd58b8f.tar.gz |
Auto-merge from mysql-trunk-merge.
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 0e23ba64843..ef4eef3276c 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); |