diff options
| author | monty@hundin.mysql.fi <> | 2002-06-02 21:22:20 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-06-02 21:22:20 +0300 |
| commit | 6e54cc492c424a7697a7139600b67b9cfe36a5da (patch) | |
| tree | 3ff8869368f9ada509521ec47ec79586d3c86167 /sql/field.cc | |
| parent | d1e13bec397f4aa737c3dff85dbb01ae526d9429 (diff) | |
| download | mariadb-git-6e54cc492c424a7697a7139600b67b9cfe36a5da.tar.gz | |
Extension of .frm file (not yet ready for push)
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/sql/field.cc b/sql/field.cc index 75cbedbb71b..819583ba9fb 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -4489,9 +4489,7 @@ void Field_enum::sql_type(String &res) const { if (flag) res.append(','); - res.append('\''); - append_unescaped(&res,*pos); - res.append('\''); + append_unescaped(&res, *pos, strlen(*pos)); flag=1; } res.append(')'); @@ -4610,9 +4608,7 @@ void Field_set::sql_type(String &res) const { if (flag) res.append(','); - res.append('\''); - append_unescaped(&res,*pos); - res.append('\''); + append_unescaped(&res, *pos, strlen(*pos)); flag=1; } res.append(')'); @@ -4713,6 +4709,7 @@ uint pack_length_to_packflag(uint type) Field *make_field(char *ptr, uint32 field_length, uchar *null_pos, uchar null_bit, uint pack_flag, + enum_field_types field_type, Field::utype unireg_check, TYPELIB *interval, const char *field_name, @@ -4728,7 +4725,8 @@ Field *make_field(char *ptr, uint32 field_length, if (!f_is_packed(pack_flag)) return new Field_string(ptr,field_length,null_pos,null_bit, unireg_check, field_name, table, - f_is_binary(pack_flag) != 0, default_charset_info); + f_is_binary(pack_flag) != 0, + default_charset_info); uint pack_length=calc_pack_length((enum_field_types) f_packtype(pack_flag), @@ -4756,7 +4754,7 @@ Field *make_field(char *ptr, uint32 field_length, } } - switch ((enum enum_field_types) f_packtype(pack_flag)) { + switch (field_type) { case FIELD_TYPE_DECIMAL: return new Field_decimal(ptr,field_length,null_pos,null_bit, unireg_check, field_name, table, |