diff options
| author | Alexander Barkov <bar@mariadb.org> | 2016-04-02 00:18:58 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2016-04-02 00:18:58 +0400 |
| commit | e975cd0ba90280e98556764c4fbdae74addd870f (patch) | |
| tree | cc8b44dd3122504ac8116c74c55cab87a80f87d3 /sql/sql_load.cc | |
| parent | 3fc6a8b832fd152f1fbabff08273e0223c0ff0ab (diff) | |
| download | mariadb-git-e975cd0ba90280e98556764c4fbdae74addd870f.tar.gz | |
MDEV-9842 LOAD DATA INFILE does not work well with a TEXT column when using sjis
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index f1c29203f3e..ed8c4d8d53d 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -1492,7 +1492,8 @@ int READ_INFO::read_field() for (;;) { - while ( to < end_of_buff) + // Make sure we have enough space for the longest multi-byte character. + while ( to + read_charset->mbmaxlen <= end_of_buff) { chr = GET; if (chr == my_b_EOF) |