diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-01-29 17:31:20 +0400 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-01-29 17:31:20 +0400 |
| commit | 307ed01440291b47e938073666f5e77c62eefb8c (patch) | |
| tree | 264982c7494f97fc034269d9b20c340299092a4b /sql/field.h | |
| parent | 6a188877d440749e51aafdc98e4e656ae166d9ba (diff) | |
| download | mariadb-git-307ed01440291b47e938073666f5e77c62eefb8c.tar.gz | |
Move latin1 into a separarte file
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 f184c145b6e..f13ef2ee735 100644 --- a/sql/field.h +++ b/sql/field.h @@ -205,7 +205,7 @@ public: uint fill_cache_field(struct st_cache_field *copy); virtual bool get_date(TIME *ltime,bool fuzzydate); virtual bool get_time(TIME *ltime); - virtual CHARSET_INFO *charset(void) const { return my_charset_bin; } + virtual CHARSET_INFO *charset(void) const { return &my_charset_bin; } virtual void set_charset(CHARSET_INFO *charset) { } friend bool reopen_table(THD *,struct st_table *,bool); friend int cre_myisam(my_string name, register TABLE *form, uint options, @@ -943,11 +943,11 @@ public: enum utype unireg_check_arg, const char *field_name_arg, struct st_table *table_arg,uint blob_pack_length) :Field_blob(ptr_arg, null_ptr_arg, null_bit_arg, unireg_check_arg, - field_name_arg, table_arg, blob_pack_length,my_charset_bin) {} + field_name_arg, table_arg, blob_pack_length,&my_charset_bin) {} Field_geom(uint32 len_arg,bool maybe_null_arg, const char *field_name_arg, struct st_table *table_arg) :Field_blob(len_arg, maybe_null_arg, field_name_arg, - table_arg, my_charset_bin) {} + table_arg, &my_charset_bin) {} enum ha_base_keytype key_type() const { return HA_KEYTYPE_VARBINARY; } enum_field_types type() const { return FIELD_TYPE_GEOMETRY;} void sql_type(String &str) const; |