diff options
| author | Mikael Ronstrom <mikael@dator8> | 2011-03-04 12:35:24 +0100 |
|---|---|---|
| committer | Mikael Ronstrom <mikael@dator8> | 2011-03-04 12:35:24 +0100 |
| commit | 0fc7078e53eb2b34503ddd2408844c2fa06d393f (patch) | |
| tree | bccbd7ab21bb499f9f924e6f90e9303f3018d1ae /sql/sql_string.cc | |
| parent | 23296fdc18e864b1b016b4c6a47723b26480f9c6 (diff) | |
| parent | a4711099716c53490a69c3c17a8b61a4a3282b19 (diff) | |
| download | mariadb-git-0fc7078e53eb2b34503ddd2408844c2fa06d393f.tar.gz | |
merge
Diffstat (limited to 'sql/sql_string.cc')
| -rw-r--r-- | sql/sql_string.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc index d19b876a82f..66f293a82c6 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -252,8 +252,8 @@ bool String::copy_aligned(const char *str,uint32 arg_length, uint32 offset, CHARSET_INFO *cs) { /* How many bytes are in incomplete character */ - offset= cs->mbmaxlen - offset; /* How many zeros we should prepend */ - DBUG_ASSERT(offset && offset != cs->mbmaxlen); + offset= cs->mbminlen - offset; /* How many zeros we should prepend */ + DBUG_ASSERT(offset && offset != cs->mbminlen); uint32 aligned_length= arg_length + offset; if (alloc(aligned_length)) |