summaryrefslogtreecommitdiff
path: root/sql/item_cmpfunc.h
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2010-03-01 13:06:11 +0300
committerAlexander Nozdrin <alik@sun.com>2010-03-01 13:06:11 +0300
commitb73cba223bb6cbf98d55fbe85c75163122e678e1 (patch)
tree081912c9d4ed65399258f0edf6887fe9b563e083 /sql/item_cmpfunc.h
parent41110ca1bfd706192949d76dbaf947bf83d0c571 (diff)
parent06ca4ae33d514f3bfa3eaa8b943876110384a8a3 (diff)
downloadmariadb-git-b73cba223bb6cbf98d55fbe85c75163122e678e1.tar.gz
Manual merge from mysql-next-mr.
Conflicts: - sql/item.cc
Diffstat (limited to 'sql/item_cmpfunc.h')
-rw-r--r--sql/item_cmpfunc.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h
index c3859ab29b9..3232a77ac3e 100644
--- a/sql/item_cmpfunc.h
+++ b/sql/item_cmpfunc.h
@@ -637,6 +637,11 @@ public:
{
Item_func::print(str, query_type);
}
+ void fix_length_and_dec()
+ {
+ Item_bool_func2::fix_length_and_dec();
+ fix_char_length(2); // returns "1" or "0" or "-1"
+ }
};