diff options
author | cmiller@zippy.cornsilk.net <> | 2007-02-13 10:54:04 -0500 |
---|---|---|
committer | cmiller@zippy.cornsilk.net <> | 2007-02-13 10:54:04 -0500 |
commit | 11e8f4873459ed70379c1d1e813fa126f25b40cd (patch) | |
tree | dd32c329ae576946f3a73dda88aa8e45b367f5c6 /sql/item_cmpfunc.h | |
parent | da9f2149dea1c20c5dc52d0de5bcd0ff19c99fc1 (diff) | |
parent | 8dc8e07fcf38365eb268d3ce3edbdf29bde89323 (diff) | |
download | mariadb-git-11e8f4873459ed70379c1d1e813fa126f25b40cd.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
Diffstat (limited to 'sql/item_cmpfunc.h')
-rw-r--r-- | sql/item_cmpfunc.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index 4635a301c31..a13be83e093 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -33,6 +33,7 @@ class Arg_comparator: public Sql_alloc arg_cmp_func func; Item_bool_func2 *owner; Arg_comparator *comparators; // used only for compare_row() + double precision; public: DTCollation cmp_collation; @@ -77,6 +78,8 @@ public: int compare_e_int(); // compare args[0] & args[1] int compare_e_int_diff_signedness(); int compare_e_row(); // compare args[0] & args[1] + int compare_real_fixed(); + int compare_e_real_fixed(); static arg_cmp_func comparator_matrix [4][2]; |