diff options
| author | unknown <tulin@dl145b.mysql.com> | 2005-06-21 07:52:33 +0200 |
|---|---|---|
| committer | unknown <tulin@dl145b.mysql.com> | 2005-06-21 07:52:33 +0200 |
| commit | ca2e8ed7f372351fbf290445b2f5afd4840d7b45 (patch) | |
| tree | 81b5939e2f2fdd361ee0f8f4e73bfda6a975a6f6 /sql/field.h | |
| parent | f8c0b06a5ca2b7d36b5904009c3adb999f6936d4 (diff) | |
| parent | c2e9730818d9b4a3aa2c237085d3cd41e3001414 (diff) | |
| download | mariadb-git-ca2e8ed7f372351fbf290445b2f5afd4840d7b45.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
sql/Makefile.am:
Auto merged
sql/field.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
storage/myisam/ft_boolean_search.c:
Auto merged
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/field.h b/sql/field.h index 29d7d300acb..f297b17fd67 100644 --- a/sql/field.h +++ b/sql/field.h @@ -25,6 +25,7 @@ #endif #define NOT_FIXED_DEC 31 +#define DATETIME_DEC 6 class Send_field; class Protocol; @@ -945,6 +946,7 @@ public: enum ha_base_keytype key_type() const { return HA_KEYTYPE_ULONGLONG; } #endif enum Item_result cmp_type () const { return INT_RESULT; } + uint decimals() const { return DATETIME_DEC; } int store(const char *to,uint length,CHARSET_INFO *charset); int store(double nr); int store(longlong nr); |