diff options
| author | gkodinov/kgeorge@macbook.gmz <> | 2008-01-08 12:27:15 +0200 |
|---|---|---|
| committer | gkodinov/kgeorge@macbook.gmz <> | 2008-01-08 12:27:15 +0200 |
| commit | 5b9e61b282a624945dd2631f58d1949b6645dc51 (patch) | |
| tree | 650f362139e17a110e633e109e028c115243e8bf /sql/field.h | |
| parent | 271005341695532d9b85a61af7a8d6dde2dd1765 (diff) | |
| download | mariadb-git-5b9e61b282a624945dd2631f58d1949b6645dc51.tar.gz | |
merge of bug 33256 5.0-opt -> 5.1-opt
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/field.h b/sql/field.h index 365072a4eec..a6a1d8bfabc 100644 --- a/sql/field.h +++ b/sql/field.h @@ -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; } |