diff options
| author | unknown <hf@deer.mysql.r18.ru> | 2002-12-17 19:57:23 +0400 |
|---|---|---|
| committer | unknown <hf@deer.mysql.r18.ru> | 2002-12-17 19:57:23 +0400 |
| commit | d0598c88d037431371d106643ba7a6543e386354 (patch) | |
| tree | 6d392e305b734590dcd3c4771d14b127e28fbad8 /sql/field.h | |
| parent | 44d684d13ff261ff8acd9b40f6abde54c78efbfb (diff) | |
| parent | fddbc989a4c42a58f5986fb158145763ce47107a (diff) | |
| download | mariadb-git-d0598c88d037431371d106643ba7a6543e386354.tar.gz | |
Merging
BitKeeper/etc/logging_ok:
auto-union
include/mysql.h:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/field.h b/sql/field.h index 9258e15ed04..672fc785acc 100644 --- a/sql/field.h +++ b/sql/field.h @@ -262,6 +262,7 @@ public: unireg_check_arg, field_name_arg, table_arg) { field_charset=charset; } Item_result result_type () const { return STRING_RESULT; } + void add_binary_or_charset(String &res) const; uint decimals() const { return NOT_FIXED_DEC; } void make_field(Send_field *); uint size_of() const { return sizeof(*this); } @@ -556,7 +557,7 @@ public: int cmp(const char *a, const char *b) { return 0;} void sort_string(char *buff, uint length) {} uint32 pack_length() const { return 0; } - void sql_type(String &str) const { str.set("null",4,my_thd_charset); } + void sql_type(String &str) const; uint size_of() const { return sizeof(*this); } }; |