diff options
| author | stuconnolly <stuart02@gmail.com> | 2011-08-03 19:40:45 +0000 |
|---|---|---|
| committer | stuconnolly <stuart02@gmail.com> | 2011-08-03 19:40:45 +0000 |
| commit | b26a4c45cbafedefe0247971c1ae9961abfe24c3 (patch) | |
| tree | 8757a4c49530958918fb37d073aaabbf2702ad0f /Frameworks/MCPKit/MySQL/include | |
| parent | e70486eb1503cad882a0d5e452fef3b2fecf6629 (diff) | |
| download | sequelpro-b26a4c45cbafedefe0247971c1ae9961abfe24c3.tar.gz sequelpro-b26a4c45cbafedefe0247971c1ae9961abfe24c3.tar.bz2 sequelpro-b26a4c45cbafedefe0247971c1ae9961abfe24c3.zip | |
Bring outline view up to date with trunk (r3307:r3375).
Diffstat (limited to 'Frameworks/MCPKit/MySQL/include')
| -rw-r--r-- | Frameworks/MCPKit/MySQL/include/mysql.h | 3 | ||||
| -rw-r--r-- | Frameworks/MCPKit/MySQL/include/mysql_com.h | 2 | ||||
| -rw-r--r-- | Frameworks/MCPKit/MySQL/include/mysql_embed.h | 1 | ||||
| -rw-r--r-- | Frameworks/MCPKit/MySQL/include/mysql_version.h | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/Frameworks/MCPKit/MySQL/include/mysql.h b/Frameworks/MCPKit/MySQL/include/mysql.h index dcf3e167..699bd1f1 100644 --- a/Frameworks/MCPKit/MySQL/include/mysql.h +++ b/Frameworks/MCPKit/MySQL/include/mysql.h @@ -224,7 +224,8 @@ struct st_mysql_options { enum mysql_status { - MYSQL_STATUS_READY,MYSQL_STATUS_GET_RESULT,MYSQL_STATUS_USE_RESULT + MYSQL_STATUS_READY, MYSQL_STATUS_GET_RESULT, MYSQL_STATUS_USE_RESULT, + MYSQL_STATUS_STATEMENT_GET_RESULT }; enum mysql_protocol_type diff --git a/Frameworks/MCPKit/MySQL/include/mysql_com.h b/Frameworks/MCPKit/MySQL/include/mysql_com.h index 7d3dd3d4..357519d5 100644 --- a/Frameworks/MCPKit/MySQL/include/mysql_com.h +++ b/Frameworks/MCPKit/MySQL/include/mysql_com.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 diff --git a/Frameworks/MCPKit/MySQL/include/mysql_embed.h b/Frameworks/MCPKit/MySQL/include/mysql_embed.h index 4a7fd3ef..a7d6e610 100644 --- a/Frameworks/MCPKit/MySQL/include/mysql_embed.h +++ b/Frameworks/MCPKit/MySQL/include/mysql_embed.h @@ -20,7 +20,6 @@ /* Things we don't need in the embedded version of MySQL */ /* TODO HF add #undef HAVE_VIO if we don't want client in embedded library */ -#undef HAVE_PSTACK /* No stacktrace */ #undef HAVE_OPENSSL #undef HAVE_SMEM /* No shared memory */ #undef HAVE_NDBCLUSTER_DB /* No NDB cluster */ diff --git a/Frameworks/MCPKit/MySQL/include/mysql_version.h b/Frameworks/MCPKit/MySQL/include/mysql_version.h index 736c2021..1eba2ede 100644 --- a/Frameworks/MCPKit/MySQL/include/mysql_version.h +++ b/Frameworks/MCPKit/MySQL/include/mysql_version.h @@ -9,11 +9,11 @@ #include <custom_conf.h> #else #define PROTOCOL_VERSION 10 -#define MYSQL_SERVER_VERSION "5.1.50" +#define MYSQL_SERVER_VERSION "5.1.57" #define MYSQL_BASE_VERSION "mysqld-5.1" #define MYSQL_SERVER_SUFFIX_DEF "" #define FRM_VER 6 -#define MYSQL_VERSION_ID 50150 +#define MYSQL_VERSION_ID 50157 #define MYSQL_PORT 3306 #define MYSQL_PORT_DEFAULT 0 #define MYSQL_UNIX_ADDR "/tmp/mysql.sock" |