summaryrefslogtreecommitdiff
path: root/innobase
diff options
context:
space:
mode:
authorunknown <marko@hundin.mysql.fi>2005-03-01 20:46:23 +0200
committerunknown <marko@hundin.mysql.fi>2005-03-01 20:46:23 +0200
commita10fb6971ae10304dac0798e79f5a6824aed0620 (patch)
tree75f2c06fcb16bb6c1597a29954444bfcd85824a0 /innobase
parent22e0b300a47321ec8dfef0bb8bc5f7c0f1449ce1 (diff)
downloadmariadb-git-a10fb6971ae10304dac0798e79f5a6824aed0620.tar.gz
row0sel.c:
row_sel_store_mysql_rec(): Do not try to space-pad BLOB fields. (Bug #8771) innobase/row/row0sel.c: row_sel_store_mysql_rec(): Do not try to space-pad BLOB fields. (Bug #8771)
Diffstat (limited to 'innobase')
-rw-r--r--innobase/row/row0sel.c5
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));