diff options
| author | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-12-20 08:32:51 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-12-20 08:32:51 +0100 |
| commit | 3a13408f8547b0f15952b8fd909bcc527910cc1a (patch) | |
| tree | c40db0891ce6035f13157b94c5cfe88392cc8ec0 /sql | |
| parent | 82e026c1462dc2b5971bb83efffa5a82492dc1e7 (diff) | |
| parent | 473d424782e46f4870605bdf482cd5f7e242e7a9 (diff) | |
| download | mariadb-git-3a13408f8547b0f15952b8fd909bcc527910cc1a.tar.gz | |
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into mysql.com:/misc/mysql/31990/51-31990
mysql-test/r/type_date.result:
Auto merged
mysql-test/t/cast.test:
Auto merged
mysql-test/t/type_date.test:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/field.cc | 7 | ||||
| -rw-r--r-- | sql/field.h | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/sql/field.cc b/sql/field.cc index 93588992fed..52168e713aa 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -5636,6 +5636,13 @@ String *Field_date::val_str(String *val_buffer, } +bool Field_date::get_time(MYSQL_TIME *ltime) +{ + bzero((char *)ltime, sizeof(MYSQL_TIME)); + return 0; +} + + int Field_date::cmp(const uchar *a_ptr, const uchar *b_ptr) { int32 a,b; diff --git a/sql/field.h b/sql/field.h index 9f76deb18bc..27be2601270 100644 --- a/sql/field.h +++ b/sql/field.h @@ -1240,6 +1240,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); |