diff options
| author | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-12-20 07:45:16 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-12-20 07:45:16 +0100 |
| commit | 0aec8b21cf71b0d45c610b228aa62fcc064116ed (patch) | |
| tree | c0d0cdb630b7804067ba18733b26a19682ae893f /sql/field.h | |
| parent | 1ebb563422e5650f80addc3adf08f88044b4b340 (diff) | |
| parent | 08b256f9df73fab94cc662d83b14131c59056385 (diff) | |
| download | mariadb-git-0aec8b21cf71b0d45c610b228aa62fcc064116ed.tar.gz | |
Merge mysql.com:/misc/mysql/31990/50-31990
into mysql.com:/misc/mysql/31990/51-31990
mysql-test/r/cast.result:
Auto merged
mysql-test/t/cast.test:
Auto merged
sql/field.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/item_timefunc.h:
Auto merged
mysql-test/r/type_date.result:
manual merge
mysql-test/t/type_date.test:
manual merge
sql/field.cc:
manual merge
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 f4314720e86..2a381065f63 100644 --- a/sql/field.h +++ b/sql/field.h @@ -1057,6 +1057,7 @@ public: double val_real(void); longlong val_int(void); String *val_str(String*,String *); + bool get_time(MYSQL_TIME *ltime); bool send_binary(Protocol *protocol); int cmp(const uchar *,const uchar *); void sort_string(uchar *buff,uint length); |