aboutsummaryrefslogtreecommitdiffstats
path: root/Frameworks/MCPKit/MySQL
diff options
context:
space:
mode:
authorrowanbeentje <rowan@beent.je>2011-06-05 16:21:33 +0000
committerrowanbeentje <rowan@beent.je>2011-06-05 16:21:33 +0000
commit8b4a88f63f2cb12b834ae7589d87747e8bfe3b39 (patch)
tree0df00dfefcd7d5b3467cd0c2180b6aa8c394a002 /Frameworks/MCPKit/MySQL
parentbd86e6d3f1e7a54d07060538a8efe04caa2789b1 (diff)
downloadsequelpro-8b4a88f63f2cb12b834ae7589d87747e8bfe3b39.tar.gz
sequelpro-8b4a88f63f2cb12b834ae7589d87747e8bfe3b39.tar.bz2
sequelpro-8b4a88f63f2cb12b834ae7589d87747e8bfe3b39.zip
- Upgrade MySQL client libraries to version 5.1.57
Diffstat (limited to 'Frameworks/MCPKit/MySQL')
-rw-r--r--Frameworks/MCPKit/MySQL/include/mysql.h3
-rw-r--r--Frameworks/MCPKit/MySQL/include/mysql_com.h2
-rw-r--r--Frameworks/MCPKit/MySQL/include/mysql_embed.h1
-rw-r--r--Frameworks/MCPKit/MySQL/include/mysql_version.h4
-rw-r--r--Frameworks/MCPKit/MySQL/lib/libmysqlclient.abin4561036 -> 4560292 bytes
-rw-r--r--Frameworks/MCPKit/MySQL/lib/libmysqlclient_r.abin4595172 -> 4594252 bytes
6 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"
diff --git a/Frameworks/MCPKit/MySQL/lib/libmysqlclient.a b/Frameworks/MCPKit/MySQL/lib/libmysqlclient.a
index ab6939c1..969697fb 100644
--- a/Frameworks/MCPKit/MySQL/lib/libmysqlclient.a
+++ b/Frameworks/MCPKit/MySQL/lib/libmysqlclient.a
Binary files differ
diff --git a/Frameworks/MCPKit/MySQL/lib/libmysqlclient_r.a b/Frameworks/MCPKit/MySQL/lib/libmysqlclient_r.a
index b04f6c35..3c8d05fd 100644
--- a/Frameworks/MCPKit/MySQL/lib/libmysqlclient_r.a
+++ b/Frameworks/MCPKit/MySQL/lib/libmysqlclient_r.a
Binary files differ