diff options
| author | unknown <marko@hundin.mysql.fi> | 2005-03-04 15:27:07 +0200 |
|---|---|---|
| committer | unknown <marko@hundin.mysql.fi> | 2005-03-04 15:27:07 +0200 |
| commit | 56c517bda121ea18df26f001c68a11a61d3a8305 (patch) | |
| tree | 7a9fbc2caea4477abd68fd65bc289ff930fddd00 /innobase | |
| parent | c56d0283ddde723bb8c8052b963d1f54b26bed3b (diff) | |
| parent | a10fb6971ae10304dac0798e79f5a6824aed0620 (diff) | |
| download | mariadb-git-56c517bda121ea18df26f001c68a11a61d3a8305.tar.gz | |
Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/mysql-4.1
Diffstat (limited to 'innobase')
| -rw-r--r-- | innobase/row/row0sel.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/innobase/row/row0sel.c b/innobase/row/row0sel.c index 2de02081176..7c935128d8a 100644 --- a/innobase/row/row0sel.c +++ b/innobase/row/row0sel.c @@ -2407,10 +2407,11 @@ row_sel_store_mysql_rec( collations will be introduced in 4.1, we hardcode the charset-collation codes here. 5.0 will use a different approach. */ - if (templ->charset == 35 + if (pad_char != '\0' + && (templ->charset == 35 || templ->charset == 90 || (templ->charset >= 128 - && templ->charset <= 144)) { + && templ->charset <= 144))) { /* There are two bytes per char, so the length has to be an even number. */ ut_a(!(templ->mysql_col_len & 1)); |