diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-10-16 13:04:42 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-10-16 13:04:42 +0200 |
| commit | ee9afef27141f55165009fdbd58e54942f3a6867 (patch) | |
| tree | b5e15e62e10daa40aef3e6d33eeabf9205d1be0f /client/sql_string.h.dontuse | |
| parent | d9a8799205d160688f81362356dd2323eb8a91ea (diff) | |
| parent | a619bfad30c13207fb0453a85af5740846186900 (diff) | |
| download | mariadb-git-ee9afef27141f55165009fdbd58e54942f3a6867.tar.gz | |
mysql-5.5.28
Diffstat (limited to 'client/sql_string.h.dontuse')
| -rw-r--r-- | client/sql_string.h.dontuse | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/client/sql_string.h.dontuse b/client/sql_string.h.dontuse index fc302110513..67155ebcee7 100644 --- a/client/sql_string.h.dontuse +++ b/client/sql_string.h.dontuse @@ -1,8 +1,7 @@ #ifndef SQL_STRING_INCLUDED #define SQL_STRING_INCLUDED -/* - Copyright (c) 2000, 2010, Oracle and/or its affiliates +/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -194,8 +193,12 @@ public: } bool real_alloc(uint32 arg_length); // Empties old string bool realloc(uint32 arg_length); - inline void shrink(uint32 arg_length) // Shrink buffer + + // Shrink the buffer, but only if it is allocated on the heap. + inline void shrink(uint32 arg_length) { + if (!is_alloced()) + return; if (arg_length < Alloced_length) { char *new_ptr; @@ -211,7 +214,7 @@ public: } } } - bool is_alloced() { return alloced; } + bool is_alloced() const { return alloced; } inline String& operator = (const String &s) { if (&s != this) |