diff options
| author | ramil@mysql.com <> | 2005-04-12 12:27:43 +0500 |
|---|---|---|
| committer | ramil@mysql.com <> | 2005-04-12 12:27:43 +0500 |
| commit | c4376b2bc60d375e73c73c22bbb76a648b1a0639 (patch) | |
| tree | 1e7496e90016ee8cc32875c8464a349bcbd4bcb4 /sql/field_conv.cc | |
| parent | 4caef066c7bcfa38d844d6b212b6e7a4605f4377 (diff) | |
| download | mariadb-git-c4376b2bc60d375e73c73c22bbb76a648b1a0639.tar.gz | |
Bit type support for non-MyISAM tables.
Diffstat (limited to 'sql/field_conv.cc')
| -rw-r--r-- | sql/field_conv.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/field_conv.cc b/sql/field_conv.cc index bbdd6619bf3..ae784ae0293 100644 --- a/sql/field_conv.cc +++ b/sql/field_conv.cc @@ -511,7 +511,7 @@ void (*Copy_field::get_copy_func(Field *to,Field *from))(Copy_field*) /* If we are copying date or datetime's we have to check the dates if we don't allow 'all' dates. -p */ + */ if (to->real_type() != from->real_type() || !compatible_db_low_byte_first || ((to->table->in_use->variables.sql_mode & @@ -594,6 +594,7 @@ void field_conv(Field *to,Field *from) !(to->flags & UNSIGNED_FLAG && !(from->flags & UNSIGNED_FLAG)) && to->real_type() != FIELD_TYPE_ENUM && to->real_type() != FIELD_TYPE_SET && + to->real_type() != FIELD_TYPE_BIT && (to->real_type() != FIELD_TYPE_NEWDECIMAL || (to->field_length == from->field_length && (((Field_num*)to)->dec == ((Field_num*)from)->dec))) && |