database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge from 5.1

Browse Source
This commit is contained in:
Magne Mahre
2011-02-17 12:53:09 +01:00
parent 2152cd958d 6503226743
commit 5a47bc87c8
8 changed files with 41 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_string.h
View File

@ -113,6 +113,9 @@ public:
inline const char *ptr() const { return Ptr; }
inline char *c_ptr()
{
DBUG_ASSERT(!alloced || !Ptr || !Alloced_length ||
(Alloced_length >= (str_length + 1)));
if (!Ptr || Ptr[str_length]) /* Should be safe */
(void) realloc(str_length);
return Ptr;