1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge 5.1 => 5.5

Browse Source
This commit is contained in:
Tor Didriksen 2012-07-26 15:06:43 +02:00
commit da4f2a26ca
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/sql_string.h
View File

@ -1,7 +1,7 @@
#ifndef CLIENT_SQL_STRING_INCLUDED #ifndef CLIENT_SQL_STRING_INCLUDED
#define CLIENT_SQL_STRING_INCLUDED #define CLIENT_SQL_STRING_INCLUDED
/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. /* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
@ -192,8 +192,12 @@ public:
} }
bool real_alloc(uint32 arg_length); // Empties old string bool real_alloc(uint32 arg_length); // Empties old string
bool realloc(uint32 arg_length); 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) if (arg_length < Alloced_length)
{ {
char *new_ptr; char *new_ptr;
@ -209,7 +213,7 @@ public:
} }
} }
} }
bool is_alloced() { return alloced; } bool is_alloced() const { return alloced; }
inline String& operator = (const String &s) inline String& operator = (const String &s)
{ {
if (&s != this) if (&s != this)

10
sql/sql_string.h
View File

@ -1,7 +1,7 @@
#ifndef SQL_STRING_INCLUDED #ifndef SQL_STRING_INCLUDED
#define SQL_STRING_INCLUDED #define SQL_STRING_INCLUDED
/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. /* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
@ -235,8 +235,12 @@ public:
} }
bool real_alloc(uint32 arg_length); // Empties old string bool real_alloc(uint32 arg_length); // Empties old string
bool realloc(uint32 arg_length); 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) if (arg_length < Alloced_length)
{ {
char *new_ptr; char *new_ptr;
@ -252,7 +256,7 @@ public:
} }
} }
} }
bool is_alloced() { return alloced; } bool is_alloced() const { return alloced; }
inline String& operator = (const String &s) inline String& operator = (const String &s)
{ {
if (&s != this) if (&s != this)