summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authormonty@mysql.com <>2004-11-12 19:01:49 +0200
committermonty@mysql.com <>2004-11-12 19:01:49 +0200
commitc724163e141feff488c9db52b930f5411fa09d37 (patch)
treeaf6bc6a9651a9437cb5dfdf1000e81e036a8c703 /sql
parentb56851fd7ac028233d312c744ea9fea1b65fe4be (diff)
downloadmariadb-git-c724163e141feff488c9db52b930f5411fa09d37.tar.gz
Fix to allow usage of 4.0 tables with 4.1
Diffstat (limited to 'sql')
-rw-r--r--sql/field.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/field.cc b/sql/field.cc
index f70a23e889a..bbd21247b8e 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -5943,6 +5943,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,