5.5 merge

This commit is contained in:
Sergei Golubchik 2014-11-19 17:23:39 +01:00
commit 3495801e2e
90 changed files with 2761 additions and 337 deletions

View file

@ -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()