diff options
| author | unknown <heikki@hundin.mysql.fi> | 2004-10-01 20:01:25 +0300 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2004-10-01 20:01:25 +0300 |
| commit | d822c6f7efbf01a3c7dc257b2e65aab8187b6098 (patch) | |
| tree | b99f5669c6448da9932bab0ed49e52fe9d08db47 /innobase/row/row0ins.c | |
| parent | 0db72d6e335d89a734bceff5f2d1a8617f5557e6 (diff) | |
| download | mariadb-git-d822c6f7efbf01a3c7dc257b2e65aab8187b6098.tar.gz | |
Many files:
Fix bug introduced by the prefix key + multibyte charsets patch today
sql/ha_innodb.cc:
Fix bug introduced by the prefix key + multibyte charsets patch today
innobase/include/data0type.h:
Fix bug introduced by the prefix key + multibyte charsets patch today
innobase/include/fsp0fsp.h:
Fix bug introduced by the prefix key + multibyte charsets patch today
innobase/data/data0type.c:
Fix bug introduced by the prefix key + multibyte charsets patch today
innobase/row/row0ins.c:
Fix bug introduced by the prefix key + multibyte charsets patch today
innobase/row/row0row.c:
Fix bug introduced by the prefix key + multibyte charsets patch today
innobase/row/row0sel.c:
Fix bug introduced by the prefix key + multibyte charsets patch today
innobase/row/row0upd.c:
Fix bug introduced by the prefix key + multibyte charsets patch today
Diffstat (limited to 'innobase/row/row0ins.c')
| -rw-r--r-- | innobase/row/row0ins.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/innobase/row/row0ins.c b/innobase/row/row0ins.c index c5d90524fdd..7b0beb9d183 100644 --- a/innobase/row/row0ins.c +++ b/innobase/row/row0ins.c @@ -2019,16 +2019,12 @@ row_ins_index_entry_set_vals( if (ind_field->prefix_len > 0 && dfield_get_len(row_field) != UNIV_SQL_NULL) { - /* For prefix keys get the storage length - for the prefix_len characters. */ - cur_type = dict_col_get_type( dict_field_get_col(ind_field)); - field->len = innobase_get_at_most_n_mbchars( - dtype_get_charset_coll(cur_type->prtype), - ind_field->prefix_len, - dfield_get_len(row_field),row_field->data); + field->len = dtype_get_at_most_n_mbchars(cur_type, + ind_field->prefix_len, + dfield_get_len(row_field), row_field->data); } else { field->len = row_field->len; } |