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 | df28a9d8048d73696133a1a93571b568e4cadf00 (patch) | |
| tree | fb5cb90f378ec2128989479d3479b6f571126236 /sql/sql_load.cc | |
| parent | 73c8173f44c1a95977c41ab35d85a03b9a8c5006 (diff) | |
| parent | 12a6e0d90eee9784199092d72887204d23fb92f9 (diff) | |
| download | mariadb-git-df28a9d8048d73696133a1a93571b568e4cadf00.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); |