From 92e7b9a652b0d1806d732079574aea7270b8a2c0 Mon Sep 17 00:00:00 2001
From: rowanbeentje <rowan@beent.je>
Date: Mon, 13 Sep 2010 22:26:54 +0000
Subject:  - Implement support for MySQL over SSL for both TCP/IP and Socket
 connection modes.  - Upgrade the MySQL binaries to version 5.1.50 (was
 5.1.46)  - Enable SSL support in the MySQL libraries (this leads to a large
 increase in library size, unfortunately)  - Enable more optimisations in the
 MySQL libraries (especially --enable-assembler for faster in-library string
 processing and --with-mysqld-ldflags=-all-static) This completes support for
 Issue #27.

---
 Frameworks/MCPKit/MySQL/include/mysql.h         |   2 ++
 Frameworks/MCPKit/MySQL/include/mysql_com.h     |  10 ++++++++++
 Frameworks/MCPKit/MySQL/include/mysql_version.h |   4 ++--
 Frameworks/MCPKit/MySQL/lib/libmysqlclient.a    | Bin 1900748 -> 4561036 bytes
 Frameworks/MCPKit/MySQL/lib/libmysqlclient_r.a  | Bin 1935244 -> 4595172 bytes
 5 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'Frameworks/MCPKit/MySQL')

diff --git a/Frameworks/MCPKit/MySQL/include/mysql.h b/Frameworks/MCPKit/MySQL/include/mysql.h
index d114afb6..dcf3e167 100644
--- a/Frameworks/MCPKit/MySQL/include/mysql.h
+++ b/Frameworks/MCPKit/MySQL/include/mysql.h
@@ -44,7 +44,9 @@ extern "C" {
 #endif
 
 #ifndef _global_h				/* If not standard header */
+#ifndef MYSQL_ABI_CHECK
 #include <sys/types.h>
+#endif
 #ifdef __LCC__
 #include <winsock2.h>				/* For windows */
 #endif
diff --git a/Frameworks/MCPKit/MySQL/include/mysql_com.h b/Frameworks/MCPKit/MySQL/include/mysql_com.h
index db5a5eb8..7d3dd3d4 100644
--- a/Frameworks/MCPKit/MySQL/include/mysql_com.h
+++ b/Frameworks/MCPKit/MySQL/include/mysql_com.h
@@ -277,6 +277,16 @@ typedef struct st_net {
   /** Client library sqlstate buffer. Set along with the error message. */
   char sqlstate[SQLSTATE_LENGTH+1];
   void *extension;
+#if defined(MYSQL_SERVER) && !defined(EMBEDDED_LIBRARY)
+  /*
+    Controls whether a big packet should be skipped.
+
+    Initially set to FALSE by default. Unauthenticated sessions must have
+    this set to FALSE so that the server can't be tricked to read packets
+    indefinitely.
+  */
+  my_bool skip_big_packet;
+#endif
 } NET;
 
 
diff --git a/Frameworks/MCPKit/MySQL/include/mysql_version.h b/Frameworks/MCPKit/MySQL/include/mysql_version.h
index 7017707c..736c2021 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.46"
+#define MYSQL_SERVER_VERSION		"5.1.50"
 #define MYSQL_BASE_VERSION		"mysqld-5.1"
 #define MYSQL_SERVER_SUFFIX_DEF		""
 #define FRM_VER				6
-#define MYSQL_VERSION_ID		50146
+#define MYSQL_VERSION_ID		50150
 #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 512d3b52..ab6939c1 100644
Binary files a/Frameworks/MCPKit/MySQL/lib/libmysqlclient.a and b/Frameworks/MCPKit/MySQL/lib/libmysqlclient.a differ
diff --git a/Frameworks/MCPKit/MySQL/lib/libmysqlclient_r.a b/Frameworks/MCPKit/MySQL/lib/libmysqlclient_r.a
index a9ae37fe..b04f6c35 100644
Binary files a/Frameworks/MCPKit/MySQL/lib/libmysqlclient_r.a and b/Frameworks/MCPKit/MySQL/lib/libmysqlclient_r.a differ
-- 
cgit v1.2.3