diff options
| author | unknown <igor@rurik.mysql.com> | 2006-04-12 13:23:11 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2006-04-12 13:23:11 -0700 |
| commit | a00a3bb9eb719ad45cca33c7c14e317f2a432788 (patch) | |
| tree | 0e931bec089509ebd89a8eb00a6cb2c028f8050f /sql/item_timefunc.h | |
| parent | c1491e7694884372d3c1a08bdadab0ad2b40135a (diff) | |
| parent | b54cb499a7e737743dfba4c27e3885e48e53d19a (diff) | |
| download | mariadb-git-a00a3bb9eb719ad45cca33c7c14e317f2a432788.tar.gz | |
Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
mysql-test/r/func_time.result:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/sql_insert.cc:
Auto merged
mysql-test/r/innodb.result:
Manual merge
mysql-test/t/innodb.test:
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 fd2f3945fca..c5ea618dafe 100644 --- a/sql/item_timefunc.h +++ b/sql/item_timefunc.h @@ -647,6 +647,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); }; |