diff options
| author | ramil@mysql.com <> | 2005-04-12 12:30:09 +0500 |
|---|---|---|
| committer | ramil@mysql.com <> | 2005-04-12 12:30:09 +0500 |
| commit | 3b1c3d8c686c23db2a79266fc235d774155b2163 (patch) | |
| tree | c130f6491e5ebabdb611541a8e0e0ab5b9cdbadc /sql/ha_innodb.cc | |
| parent | 2b7ec71836a1afdfeee69da24f22334dd6f05b00 (diff) | |
| parent | c4376b2bc60d375e73c73c22bbb76a648b1a0639 (diff) | |
| download | mariadb-git-3b1c3d8c686c23db2a79266fc235d774155b2163.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0.bit_class
Diffstat (limited to 'sql/ha_innodb.cc')
| -rw-r--r-- | sql/ha_innodb.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 5ffa9e26ea2..bc4cc1267e0 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -2233,6 +2233,7 @@ innobase_mysql_cmp( switch (mysql_tp) { + case MYSQL_TYPE_BIT: case MYSQL_TYPE_STRING: case MYSQL_TYPE_VAR_STRING: case FIELD_TYPE_TINY_BLOB: @@ -2342,6 +2343,7 @@ get_innobase_type_from_mysql_type( } else { return(DATA_VARMYSQL); } + case MYSQL_TYPE_BIT: case MYSQL_TYPE_STRING: if (field->binary()) { return(DATA_FIXBINARY); |