diff options
| author | unknown <mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-04-21 09:30:19 -0400 |
|---|---|---|
| committer | unknown <mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-04-21 09:30:19 -0400 |
| commit | 34a11a322d5a534cceec4d13293a491cf5077c0d (patch) | |
| tree | 3339db78538bb6460acbe9b5f921a17b228744fd /sql/item_timefunc.h | |
| parent | 328da025e0f5d69507d865977f9b68f4af9126d9 (diff) | |
| parent | 17e3ee35531d0003de31093570e64f604bd8c4fa (diff) | |
| download | mariadb-git-34a11a322d5a534cceec4d13293a491cf5077c0d.tar.gz | |
Merge mronstrom@bk-internal.mysql.com:/home/bk/bugs/bug18198
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198
sql/item_timefunc.h:
Auto merged
sql/partition_info.cc:
Auto merged
sql/share/errmsg.txt:
manual merge
Diffstat (limited to 'sql/item_timefunc.h')
| -rw-r--r-- | sql/item_timefunc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h index ffe049873fc..a42232fd0fc 100644 --- a/sql/item_timefunc.h +++ b/sql/item_timefunc.h @@ -667,6 +667,7 @@ public: double val_real() { DBUG_ASSERT(fixed == 1); return (double) val_int(); } longlong val_int(); bool get_date(TIME *res, uint fuzzy_date); + bool eq(const Item *item, bool binary_cmp) const; void print(String *str); virtual bool check_partition_func_processor(byte *bool_arg) { return 0;} }; |