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.cc | |
| 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.cc')
| -rw-r--r-- | sql/field.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/field.cc b/sql/field.cc index 36ba6e6f12c..0ba1e77a4af 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -5524,6 +5524,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; |