diff options
| author | monty@mysql.com <> | 2004-11-12 19:58:24 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-11-12 19:58:24 +0200 |
| commit | addd1a0da882615330368c8815b0c13d17bf0232 (patch) | |
| tree | e0dd750287073966f1595d8099b4cc23faa803f7 /sql/field.cc | |
| parent | 16c1b9f44e36de0867afb15ba6e6baa4fb9a857d (diff) | |
| parent | 08c5b245b88eda61c95febea3d02394b76605d79 (diff) | |
| download | mariadb-git-addd1a0da882615330368c8815b0c13d17bf0232.tar.gz | |
Merge with 4.1
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/field.cc b/sql/field.cc index 56e3ab71bd8..5332607c6d5 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -5971,6 +5971,7 @@ Field *make_field(char *ptr, uint32 field_length, if (!f_is_packed(pack_flag)) { if (field_type == FIELD_TYPE_STRING || + field_type == FIELD_TYPE_DECIMAL || // 3.23 or 4.0 string field_type == FIELD_TYPE_VAR_STRING) return new Field_string(ptr,field_length,null_pos,null_bit, unireg_check, field_name, table, |