diff options
| author | marko@hundin.mysql.fi <> | 2004-12-17 18:35:11 +0200 |
|---|---|---|
| committer | marko@hundin.mysql.fi <> | 2004-12-17 18:35:11 +0200 |
| commit | e2f9201041551188a7b7fa26bc2daafe54269d44 (patch) | |
| tree | c409114526e80bf5c0378ea758cd06c7cc3ba8c4 /sql/ha_innodb.cc | |
| parent | 9311c8f56497651623df518f8e38edac49178878 (diff) | |
| download | mariadb-git-e2f9201041551188a7b7fa26bc2daafe54269d44.tar.gz | |
InnoDB: Fixed bugs in the padding and trimming of trailing spaces
that affected the UCS2 character set. (Bug #7350)
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 cc69762cbdb..8110df1063f 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -2248,6 +2248,8 @@ build_template( templ->mysql_col_len = (ulint) field->pack_length(); templ->type = get_innobase_type_from_mysql_type(field); + templ->charset = dtype_get_charset_coll_noninline( + index->table->cols[i].type.prtype); templ->is_unsigned = (ulint) (field->flags & UNSIGNED_FLAG); if (templ->type == DATA_BLOB) { |