diff options
| author | Monty <monty@mariadb.org> | 2018-07-12 18:12:20 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2018-07-13 20:14:27 +0300 |
| commit | a9ca819897f5c82582bfd3fedb09c78131cf8e00 (patch) | |
| tree | a5caee7d6da5c9ee1046cdf509586e4f7a313e56 /sql/sql_string.cc | |
| parent | 5180eda342c07d44bdc06b9b872f1673224fdeed (diff) | |
| download | mariadb-git-a9ca819897f5c82582bfd3fedb09c78131cf8e00.tar.gz | |
Call alloc() instead of realloc()
Use alloc() if we don't need original string (avoid copy)
Removed not needed test of str_length in sql_string.cc
Diffstat (limited to 'sql/sql_string.cc')
| -rw-r--r-- | sql/sql_string.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc index 5d5cc90431b..e7acabe8bee 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -103,8 +103,7 @@ bool String::realloc_raw(size_t alloc_length) (thread_specific ? MY_THREAD_SPECIFIC : 0))))) { - if (str_length > len - 1) - str_length= 0; + DBUG_ASSERT(str_length < len); if (str_length) // Avoid bugs in memcpy on AIX memcpy(new_ptr,Ptr,str_length); new_ptr[str_length]=0; |