diff options
| author | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-11-01 15:41:51 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-11-01 15:41:51 +0400 |
| commit | bec1973eee55af5b681ad737e6edfb7543faff6d (patch) | |
| tree | d171ff0c22675cb8769a8caeea49028d3ccbef81 /sql/field.h | |
| parent | 81dac08b5205a7ef81c80ea824a487df95cb8f51 (diff) | |
| parent | d922d5b6be1d45069bd87614a2688c49ef25ad8b (diff) | |
| download | mariadb-git-bec1973eee55af5b681ad737e6edfb7543faff6d.tar.gz | |
Merge mysql.com:/home/hf/work/19491/my50-19491
into mysql.com:/home/hf/work/mysql-5.0.19491
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
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 b79c2bf77a8..8b22424265d 100644 --- a/sql/field.h +++ b/sql/field.h @@ -489,6 +489,7 @@ public: int store(const char *to, uint length, CHARSET_INFO *charset); int store(double nr); int store(longlong nr, bool unsigned_val); + int store_time(TIME *ltime, timestamp_type t_type); int store_decimal(const my_decimal *); double val_real(void); longlong val_int(void); |