diff options
| author | unknown <gshchepa/uchum@gleb.loc> | 2007-11-19 21:34:21 +0400 |
|---|---|---|
| committer | unknown <gshchepa/uchum@gleb.loc> | 2007-11-19 21:34:21 +0400 |
| commit | ea739898281a86c074275f2f0a084840d7ed3e44 (patch) | |
| tree | 9db47a6ebc5ed1c5edd36bbde3240226cfed3a47 /sql/sql_string.cc | |
| parent | ac0612f5599a8a0038dcf4031a85e92b67bac1d0 (diff) | |
| download | mariadb-git-ea739898281a86c074275f2f0a084840d7ed3e44.tar.gz | |
Fixed bug #32282: TEXT silently truncates when value is exactly 65536
bytes length.
The server has been modified to report warnings on truncation to
65536 bytes as usual.
sql/sql_string.cc:
Fixed bug #32282.
The well_formed_copy_nchars function returned an incorrect value
of copied bytes of the truncated input string: extra length of
the first truncated character added to the *from_end_pos pointer.
That has been fixed.
mysql-test/r/type_blob.result:
Added test case for bug #32282.
mysql-test/t/type_blob.test:
Added test case for bug #32282.
Diffstat (limited to 'sql/sql_string.cc')
| -rw-r--r-- | sql/sql_string.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc index 9d7df73cd7a..606a9ddb26d 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -858,7 +858,7 @@ outp: with optional left padding (for binary -> UCS2 conversion) SYNOPSIS - well_formed_copy_nhars() + well_formed_copy_nchars() to Store result here to_length Maxinum length of "to" string to_cs Character set of "to" string @@ -997,7 +997,10 @@ outp: goto outp; } else + { + from= from_prev; break; + } } *from_end_pos= from; res= to - to_start; |