diff options
author | Sergey Glukhov <sergey.glukhov@oracle.com> | 2011-04-15 12:55:21 +0400 |
---|---|---|
committer | Sergey Glukhov <sergey.glukhov@oracle.com> | 2011-04-15 12:55:21 +0400 |
commit | 98d524599adf3b3639ce3e9ebe5c4d2f399ff32a (patch) | |
tree | fb5cb90f378ec2128989479d3479b6f571126236 /sql/sql_load.cc | |
parent | 9cd03942ab81201add2eb537a9987f65992eda52 (diff) | |
parent | bba7b9ca0c96a1c140e725776b5e0382a4f62152 (diff) | |
download | mariadb-git-98d524599adf3b3639ce3e9ebe5c4d2f399ff32a.tar.gz |
5.1 -> 5.5 merge
Diffstat (limited to 'sql/sql_load.cc')
-rw-r--r-- | sql/sql_load.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index a2d443fbbc8..0589488d850 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -1337,7 +1337,7 @@ READ_INFO::READ_INFO(File file_par, uint tot_length, CHARSET_INFO *cs, /* Set of a stack for unget if long terminators */ - uint length=max(field_term_length,line_term_length)+1; + uint length= max(cs->mbmaxlen, max(field_term_length, line_term_length)) + 1; set_if_bigger(length,line_start.length()); stack=stack_pos=(int*) sql_alloc(sizeof(int)*length); |