diff options
| author | unknown <kent@kent-amd64.(none)> | 2007-07-21 01:53:19 +0200 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2007-07-21 01:53:19 +0200 |
| commit | 47507276aa628ab51878ca36f0af47541ac04755 (patch) | |
| tree | 0b56ddbf67df3ed64d453b4f68cc0e931ca79549 /sql/item_cmpfunc.h | |
| parent | 366c21fef8981a6ca3ac909eb14b75b99a0a5278 (diff) | |
| parent | d758b1e629a78e1cf58c8a04da51e3c33630368c (diff) | |
| download | mariadb-git-47507276aa628ab51878ca36f0af47541ac04755.tar.gz | |
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/kent/bk/tmp3/mysql-5.0-build
libmysql/libmysql.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/field.cc:
Auto merged
Diffstat (limited to 'sql/item_cmpfunc.h')
| -rw-r--r-- | sql/item_cmpfunc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index 79091b9c87d..9afc0507817 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -42,6 +42,8 @@ class Arg_comparator: public Sql_alloc bool is_nulls_eq; // TRUE <=> compare for the EQUAL_FUNC enum enum_date_cmp_type { CMP_DATE_DFLT= 0, CMP_DATE_WITH_DATE, CMP_DATE_WITH_STR, CMP_STR_WITH_DATE }; + ulonglong (*get_value_func)(THD *thd, Item ***item_arg, Item **cache_arg, + Item *warn_item, bool *is_null); public: DTCollation cmp_collation; |