diff options
| author | rowanbeentje <rowan@beent.je> | 2012-04-09 16:37:31 +0000 |
|---|---|---|
| committer | rowanbeentje <rowan@beent.je> | 2012-04-09 16:37:31 +0000 |
| commit | 761ee77727eb18e0ed6980ea98ea723cb8b3e817 (patch) | |
| tree | b3090244ce5c62b31464e7d3dc1c4f370e9f62e9 /Frameworks/SPMySQLFramework/MySQL Client Libraries/include/my_alloc.h | |
| parent | 535ae6f2b8313ea6d5ae2e878dcd17d369807079 (diff) | |
| download | sequelpro-761ee77727eb18e0ed6980ea98ea723cb8b3e817.tar.gz sequelpro-761ee77727eb18e0ed6980ea98ea723cb8b3e817.tar.bz2 sequelpro-761ee77727eb18e0ed6980ea98ea723cb8b3e817.zip | |
- Upgrade to the MySQL 5.5.22 client libraries, updating to a much more up-to-date codebase.
- Update the build-mysql-client.sh MySQL build script within SPMySQL.framework to allow it to easily build 5.5 client libraries
- Fix reconnection within SPMySQL.framework after a connection is lost for MySQL servers < 5 when a query is cancelled by killing the connection
Diffstat (limited to 'Frameworks/SPMySQLFramework/MySQL Client Libraries/include/my_alloc.h')
| -rw-r--r-- | Frameworks/SPMySQLFramework/MySQL Client Libraries/include/my_alloc.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/Frameworks/SPMySQLFramework/MySQL Client Libraries/include/my_alloc.h b/Frameworks/SPMySQLFramework/MySQL Client Libraries/include/my_alloc.h index 93b7438a..9e2ef541 100644 --- a/Frameworks/SPMySQLFramework/MySQL Client Libraries/include/my_alloc.h +++ b/Frameworks/SPMySQLFramework/MySQL Client Libraries/include/my_alloc.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000, 2010, 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 @@ -11,7 +11,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ /* Data structures for mysys/my_alloc.c (root memory allocator) @@ -23,6 +23,10 @@ #define ALLOC_MAX_BLOCK_TO_DROP 4096 #define ALLOC_MAX_BLOCK_USAGE_BEFORE_DROP 10 +#ifdef __cplusplus +extern "C" { +#endif + typedef struct st_used_mem { /* struct for once_alloc (block) */ struct st_used_mem *next; /* Next block in use */ @@ -48,4 +52,9 @@ typedef struct st_mem_root void (*error_handler)(void); } MEM_ROOT; + +#ifdef __cplusplus +} +#endif + #endif |