diff options
| author | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-12-20 08:35:52 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-12-20 08:35:52 +0100 |
| commit | 8ba2819f96a23752b63576cad863cab9537179f7 (patch) | |
| tree | d1d3c82af6a277f6d4d79653af31e09b761b8d40 /sql/field.h | |
| parent | 5480cbd69ec553dbb266533474989ce62774516c (diff) | |
| parent | 08b256f9df73fab94cc662d83b14131c59056385 (diff) | |
| download | mariadb-git-8ba2819f96a23752b63576cad863cab9537179f7.tar.gz | |
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into mysql.com:/misc/mysql/31990/50-31990
mysql-test/r/cast.result:
Auto merged
mysql-test/r/type_date.result:
Auto merged
mysql-test/t/cast.test:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/item_timefunc.h:
Auto merged
mysql-test/t/type_date.test:
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 e5c473ed556..e2dd6d8538e 100644 --- a/sql/field.h +++ b/sql/field.h @@ -944,6 +944,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 char *,const char*); void sort_string(char *buff,uint length); |