merge of bug 33256 5.0-opt -> 5.1-opt
This commit is contained in:
parent
c82a7b9497
commit
34cae15606
@ -1270,9 +1270,9 @@ public:
|
||||
unireg_check_arg, field_name_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) {}
|
||||
CHARSET_INFO *cs)
|
||||
:Field_str((uchar*) 0,10, maybe_null_arg ? (uchar*) "": 0,0,
|
||||
NONE, field_name_arg, cs) {}
|
||||
enum_field_types type() const { return MYSQL_TYPE_DATE;}
|
||||
enum_field_types real_type() const { return MYSQL_TYPE_NEWDATE; }
|
||||
enum ha_base_keytype key_type() const { return HA_KEYTYPE_UINT24; }
|
||||
|
Loading…
x
Reference in New Issue
Block a user