diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-11-19 17:23:39 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-11-19 17:23:39 +0100 |
| commit | 3495801e2e94df5a10cae6e056f65defa038a6b6 (patch) | |
| tree | de524b4bf45dbc19a95262843f2b72d0f5adb7bc /sql/sql_string.h | |
| parent | df7b27f1fe308fd4011fa020bebd7c69bcd43383 (diff) | |
| parent | 496fda66fdc34b447ef4dec26d1250b034a321e3 (diff) | |
| download | mariadb-git-3495801e2e94df5a10cae6e056f65defa038a6b6.tar.gz | |
5.5 merge
Diffstat (limited to 'sql/sql_string.h')
| -rw-r--r-- | sql/sql_string.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h index 8c7e69edf4b..c287f051d98 100644 --- a/sql/sql_string.h +++ b/sql/sql_string.h @@ -253,7 +253,9 @@ public: */ inline void chop() { - Ptr[str_length--]= '\0'; + str_length--; + Ptr[str_length]= '\0'; + DBUG_ASSERT(strlen(Ptr) == str_length); } inline void free() |