diff options
| author | unknown <monty@mysql.com> | 2004-06-10 11:59:45 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-06-10 11:59:45 +0300 |
| commit | 3e5eb498bcc47361928d20672ff6c76329860cef (patch) | |
| tree | 1899e10015ceea27466380baa0f763700a85cb5d /sql/field.h | |
| parent | 4075c305154e11dc8bacae917ea0194119785dfb (diff) | |
| parent | 3665b3be90c2821dc95903cdf39df7a54e3c91a1 (diff) | |
| download | mariadb-git-3e5eb498bcc47361928d20672ff6c76329860cef.tar.gz | |
Merge with 3.23 to get latest bug fixes
mysql-test/t/type_date.test:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/sql_acl.cc:
Auto merged
mysql-test/r/type_date.result:
merge with 3.23
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/field.h b/sql/field.h index 6f049e3809e..5a1ab163266 100644 --- a/sql/field.h +++ b/sql/field.h @@ -690,6 +690,7 @@ public: double val_real(void); longlong val_int(void); String *val_str(String*,String *); + bool get_date(TIME *ltime,bool fuzzydate); bool get_time(TIME *ltime); int cmp(const char *,const char*); void sort_string(char *buff,uint length); |