diff options
| author | Tatiana A. Nurnberg <azundris@mysql.com> | 2008-11-27 12:33:04 +0100 |
|---|---|---|
| committer | Tatiana A. Nurnberg <azundris@mysql.com> | 2008-11-27 12:33:04 +0100 |
| commit | 61296d6db7c6db5eb0f57f61c3d199fe59f2a527 (patch) | |
| tree | b702ee95f5d07603e87bd4dddb4acf6ec9915ed9 /sql/item_cmpfunc.h | |
| parent | 4bf94e7a28e4206e8307362fb2d958369eb8bbd6 (diff) | |
| parent | d096079d330f77eebd3c3abef04236a9a4a08d7b (diff) | |
| download | mariadb-git-61296d6db7c6db5eb0f57f61c3d199fe59f2a527.tar.gz | |
auto-merge
Diffstat (limited to 'sql/item_cmpfunc.h')
| -rw-r--r-- | sql/item_cmpfunc.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index 2bf39e6da8d..c2227fa04e0 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -42,8 +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); + longlong (*get_value_func)(THD *thd, Item ***item_arg, Item **cache_arg, + Item *warn_item, bool *is_null); public: DTCollation cmp_collation; @@ -1012,7 +1012,7 @@ public: */ class cmp_item_datetime :public cmp_item { - ulonglong value; + longlong value; public: THD *thd; /* Item used for issuing warnings. */ |