summaryrefslogtreecommitdiff
path: root/storage/innodb_plugin
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2011-05-26 19:16:10 +0200
committerSergei Golubchik <sergii@pisem.net>2011-05-26 19:16:10 +0200
commitc1a92f9caeb368021d5ffbe0df237ded29692c1a (patch)
tree27c69004708cbfb492ba02902699e4d331a8f11e /storage/innodb_plugin
parent34c9428871a095ad72e629be843443cef4d7052f (diff)
downloadmariadb-git-c1a92f9caeb368021d5ffbe0df237ded29692c1a.tar.gz
innodb compatibility fix
Diffstat (limited to 'storage/innodb_plugin')
-rw-r--r--storage/innodb_plugin/handler/ha_innodb.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
index 4dfd961b293..24b646e449b 100644
--- a/storage/innodb_plugin/handler/ha_innodb.cc
+++ b/storage/innodb_plugin/handler/ha_innodb.cc
@@ -3919,6 +3919,12 @@ get_innobase_type_from_mysql_type(
case HA_KEYTYPE_DOUBLE:
return(DATA_DOUBLE);
case HA_KEYTYPE_BINARY:
+ if (field->type() == MYSQL_TYPE_TINY)
+ if (field->type() == MYSQL_TYPE_TINY)
+ { // compatibility workaround
+ *unsigned_flag= 1 ;
+ return DATA_INT;
+ }
return(DATA_FIXBINARY);
case HA_KEYTYPE_VARBINARY2:
if (field->type() != MYSQL_TYPE_VARCHAR)