diff options
| author | unknown <timour@askmonty.org> | 2012-06-06 22:26:40 +0300 |
|---|---|---|
| committer | unknown <timour@askmonty.org> | 2012-06-06 22:26:40 +0300 |
| commit | c2677de7aca09a0ba4b680b5227bda3865ab9290 (patch) | |
| tree | 980157e9eaf1062641572da371d1ae7fcc371625 /sql/item_cmpfunc.h | |
| parent | 8efc63ba5d32b77501226921ee503b9ae513a365 (diff) | |
| parent | 7ddd5418d01e60dba2ae69a668e7c9f811613451 (diff) | |
| download | mariadb-git-c2677de7aca09a0ba4b680b5227bda3865ab9290.tar.gz | |
Merge the fix for lp:944706, mdev-193
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 de62bc49930..c10ce8525d4 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -371,9 +371,9 @@ public: Item_bool_func2(Item *a,Item *b) :Item_int_func(a,b), cmp(tmp_arg, tmp_arg+1), abort_on_null(FALSE) {} void fix_length_and_dec(); - void set_cmp_func() + int set_cmp_func() { - cmp.set_cmp_func(this, tmp_arg, tmp_arg+1, TRUE); + return cmp.set_cmp_func(this, tmp_arg, tmp_arg+1, TRUE); } optimize_type select_optimize() const { return OPTIMIZE_OP; } virtual enum Functype rev_functype() const { return UNKNOWN_FUNC; } |