summaryrefslogtreecommitdiff
path: root/sql/ha_innodb.cc
diff options
context:
space:
mode:
authorunknown <heikki@hundin.mysql.fi>2003-06-16 00:39:46 +0300
committerunknown <heikki@hundin.mysql.fi>2003-06-16 00:39:46 +0300
commit722e806065f0787c2e9217d6c3d501398172fbe5 (patch)
tree27d56cd87eb5acb3ee57772ad608aeaa81e7eb42 /sql/ha_innodb.cc
parent525060293cc23840980beb0e6661a6046eda3d51 (diff)
downloadmariadb-git-722e806065f0787c2e9217d6c3d501398172fbe5.tar.gz
row0mysql.c, dict0dict.ic:
Cleanup ha_innodb.cc, data0type.h: Make sure non-latin1 users can downgrade from 4.0.14 to an earlier version if they have not created DATA_BLOB column prefix indexes innobase/include/data0type.h: Make sure non-latin1 users can downgrade from 4.0.14 to an earlier version if they have not created DATA_BLOB column prefix indexes sql/ha_innodb.cc: Make sure non-latin1 users can downgrade from 4.0.14 to an earlier version if they have not created DATA_BLOB column prefix indexes innobase/include/dict0dict.ic: Cleanup innobase/row/row0mysql.c: Cleanup
Diffstat (limited to 'sql/ha_innodb.cc')
-rw-r--r--sql/ha_innodb.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc
index 081b9a85c5c..795cffc0776 100644
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -3188,7 +3188,8 @@ create_table_def(
unsigned_type = 0;
}
- if (strcmp(default_charset_info->name, "latin1") != 0) {
+ if (col_type == DATA_BLOB
+ && strcmp(default_charset_info->name, "latin1") != 0) {
nonlatin1_type = DATA_NONLATIN1;
} else {
nonlatin1_type = 0;