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 | 99a0a3b947aea6a74228376cd1d358526d9ebe2e (patch) | |
tree | 6cc5a2304ff1d8e8e5da08709d43daa27a50e91f /sql/item_cmpfunc.h | |
parent | efe619585840b27ef156b35f2be6ef3c9809d2e5 (diff) | |
parent | 4422b0f665fa3cba9f86b1c5e8e242f7839f6335 (diff) | |
download | mariadb-git-99a0a3b947aea6a74228376cd1d358526d9ebe2e.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); |