diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2008-01-07 18:55:05 +0200 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2008-01-07 18:55:05 +0200 |
| commit | b8c8ca6845d7fb2b44de03f32e41af5a5ec75a54 (patch) | |
| tree | ecb30e476a92fc78e2b5140fd1732c03de7564fa /sql/field.h | |
| parent | 90dec398a5951da7d13dceed6eac109e0771482e (diff) | |
| parent | 2ae4b047a3d9c4236ebd157ef8ee4bf084d4629b (diff) | |
| download | mariadb-git-b8c8ca6845d7fb2b44de03f32e41af5a5ec75a54.tar.gz | |
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into magare.gmz:/home/kgeorge/mysql/autopush/B33256-5.0-opt
sql/field.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/item_timefunc.h:
Auto merged
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/field.h b/sql/field.h index e2dd6d8538e..d681229a9fd 100644 --- a/sql/field.h +++ b/sql/field.h @@ -962,6 +962,10 @@ public: :Field_str(ptr_arg, 10, null_ptr_arg, null_bit_arg, unireg_check_arg, field_name_arg, table_arg, cs) {} + Field_newdate(bool maybe_null_arg, const char *field_name_arg, + struct st_table *table_arg, CHARSET_INFO *cs) + :Field_str((char*) 0,10, maybe_null_arg ? (uchar*) "": 0,0, + NONE, field_name_arg, table_arg, cs) {} enum_field_types type() const { return FIELD_TYPE_DATE;} enum_field_types real_type() const { return FIELD_TYPE_NEWDATE; } enum ha_base_keytype key_type() const { return HA_KEYTYPE_UINT24; } |