Manually roll back all changes for #2979

Those will be moved to a different branch for the time being since other stuff needs to be changed first

Frameworks/SPMySQLFramework/MySQL Client Libraries/Patches/001-cpp-dependency.diff

@@ -1,11 +1,3 @@
-This patch is neccesary to remove a linker error when trying to link SPMySQL with libmysqlclient.a.
-
-To apply:
-	cd mysql-source-root
-	patch -p1 < this-file
-
-(patch created with `diff -Naur`)
-
 --- mysql-5.5.56-dist/extra/yassl/taocrypt/include/runtime.hpp	2017-04-27 09:12:30.000000000 +0200
 +++ mysql-5.5.56/extra/yassl/taocrypt/include/runtime.hpp	2017-05-20 23:27:14.000000000 +0200
 @@ -53,8 +53,8 @@

Frameworks/SPMySQLFramework/MySQL Client Libraries/Patches/002-new-types.diff

@@ -1,12 +1,3 @@
-This patch backports field types that were added after MySQL 5.5,
-but are technically still compatible to the old client libs.
-
-To apply:
-	cd mysql-source-root
-	patch -p1 < this-file
-
-(patch created with `diff -Naur`)
-
 --- mysql-5.5.56-dist/include/mysql_com.h	2017-04-27 09:12:30.000000000 +0200
 +++ mysql-5.5.56/include/mysql_com.h	2017-05-21 01:46:44.000000000 +0200
 @@ -349,7 +349,11 @@

Frameworks/SPMySQLFramework/MySQL Client Libraries/include/mysql.h

@@ -288,18 +288,6 @@ typedef struct st_mysql
   /* needed for embedded server - no net buffer to store the 'info' */
   char *info_buffer;
   void *extension;
-
-  /* SPMySQL patch: 
-   *   Set this to a callback function that will be invoked when mysql wants to do authentication.
-   *   @param mysql          The MYSQL struct
-   *   @param plugin         The name of the auth plugin that will be used (usually either 
-   *                         "mysql_native_password", "mysql_old_password" or "mysql_clear_password")
-   *   @param with_password  A block function you must invoke, during which mysql can use the password you provide via the passwd parameter.
-   *                         After the block you should immediately clear the password from memory again.
-   */
-  void (*passwd_callback)(struct st_mysql *mysql, const char *plugin, void (^with_password)(const char *passwd));
-  /* SPMySQL patch: This is used with passwd_callback to bridge back to OOP land */
-  void *sp_context;
 } MYSQL;
 
 

Frameworks/SPMySQLFramework/MySQL Client Libraries/include/mysql_version.h

@@ -11,11 +11,11 @@
 #include <custom_conf.h>
 #else
 #define PROTOCOL_VERSION		10
-#define MYSQL_SERVER_VERSION		"5.5.59"
+#define MYSQL_SERVER_VERSION		"5.5.56"
 #define MYSQL_BASE_VERSION		"mysqld-5.5"
 #define MYSQL_SERVER_SUFFIX_DEF		""
 #define FRM_VER				6
-#define MYSQL_VERSION_ID		50559
+#define MYSQL_VERSION_ID		50556
 #define MYSQL_PORT			3306
 #define MYSQL_PORT_DEFAULT		0
 #define MYSQL_UNIX_ADDR			"/tmp/mysql.sock"

Frameworks/SPMySQLFramework/SPMySQLFramework.xcodeproj/project.pbxproj

@@ -13,7 +13,6 @@
 		507FF1E51BC0D82300104523 /* DataConversion_Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = 507FF1811BC0C64100104523 /* DataConversion_Tests.m */; };
 		507FF23B1BC0E8CA00104523 /* SPMySQL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* SPMySQL.framework */; };
 		507FF23D1BC157B500104523 /* SPMySQLStringAdditions_Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = 507FF23C1BC157B500104523 /* SPMySQLStringAdditions_Tests.m */; };
-		508FDC95204329580062A9CA /* SPMySQLUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 508FDC94204329580062A9CA /* SPMySQLUtilities.m */; };
 		580A331E14D75CF7000D6933 /* SPMySQLGeometryData.h in Headers */ = {isa = PBXBuildFile; fileRef = 580A331C14D75CF7000D6933 /* SPMySQLGeometryData.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		580A331F14D75CF7000D6933 /* SPMySQLGeometryData.m in Sources */ = {isa = PBXBuildFile; fileRef = 580A331D14D75CF7000D6933 /* SPMySQLGeometryData.m */; };
 		583C734A17A489CC0056B284 /* SPMySQLStreamingResultStoreDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 583C734917A489CC0056B284 /* SPMySQLStreamingResultStoreDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -104,7 +103,6 @@
 		507FF1D51BC0D7D300104523 /* SPMySQL Unit Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "SPMySQL Unit Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		507FF1D81BC0D7D300104523 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		507FF23C1BC157B500104523 /* SPMySQLStringAdditions_Tests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPMySQLStringAdditions_Tests.m; sourceTree = "<group>"; };
-		508FDC94204329580062A9CA /* SPMySQLUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SPMySQLUtilities.m; path = Source/SPMySQLUtilities.m; sourceTree = "<group>"; };
 		580A331C14D75CF7000D6933 /* SPMySQLGeometryData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SPMySQLGeometryData.h; path = Source/SPMySQLGeometryData.h; sourceTree = "<group>"; };
 		580A331D14D75CF7000D6933 /* SPMySQLGeometryData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SPMySQLGeometryData.m; path = Source/SPMySQLGeometryData.m; sourceTree = "<group>"; };
 		583C734917A489CC0056B284 /* SPMySQLStreamingResultStoreDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SPMySQLStreamingResultStoreDelegate.h; path = Source/SPMySQLStreamingResultStoreDelegate.h; sourceTree = "<group>"; };
@@ -275,7 +273,6 @@
 		32C88DFF0371C24200C91783 /* Other Sources */ = {
 			isa = PBXGroup;
 			children = (
-				508FDC94204329580062A9CA /* SPMySQLUtilities.m */,
 				584294E314CB8002000F8438 /* SPMySQLConstants.h */,
 				58C006C714E0B18A00AC489A /* SPMySQLUtilities.h */,
 				32DBCF5E0370ADEE00C91783 /* SPMySQLFramework_Prefix.pch */,
@@ -558,7 +555,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				508FDC96204329580062A9CA /* SPMySQLUtilities.m in Sources */,
 				507FF23D1BC157B500104523 /* SPMySQLStringAdditions_Tests.m in Sources */,
 				507FF1E51BC0D82300104523 /* DataConversion_Tests.m in Sources */,
 			);
@@ -586,7 +582,6 @@
 				58C00BD214E7459600AC489A /* Databases & Tables.m in Sources */,
 				586A99FC14F02E21007F82BF /* SPMySQLStreamingResult.m in Sources */,
 				586AA16814F30C5F007F82BF /* Convenience Methods.m in Sources */,
-				508FDC95204329580062A9CA /* SPMySQLUtilities.m in Sources */,
 				584D812F15057ECD00F24774 /* SPMySQLKeepAliveTimer.m in Sources */,
 				584D82561509775000F24774 /* Copying.m in Sources */,
 				58D2A4D216EDF1C6002EB401 /* SPMySQLEmptyResult.m in Sources */,

Frameworks/SPMySQLFramework/Source/SPMySQL Private APIs.h

@@ -41,7 +41,6 @@
 
 - (BOOL)_connect;
 - (MYSQL *)_makeRawMySQLConnectionWithEncoding:(NSString *)encodingName isMasterConnection:(BOOL)isMaster;
-- (void)_mysqlConnection:(MYSQL *)connection wantsPassword:(void (^)(const char *passwd))inBlock withPlugin:(const char *)pluginName;
 - (BOOL)_reconnectAllowingRetries:(BOOL)canRetry;
 - (BOOL)_reconnectAfterBackgroundConnectionLoss;
 - (BOOL)_waitForNetworkConnectionWithTimeout:(double)timeoutSeconds;

Frameworks/SPMySQLFramework/Source/SPMySQLConnection.h

@@ -61,7 +61,6 @@
 	pthread_t reconnectingThread;
 	uint64_t initialConnectTime;
 	unsigned long mysqlConnectionThreadId;
-	BOOL allowCleartextPlugin;
 
 	// Connection proxy
 	NSObject <SPMySQLConnectionProxy> *proxy;
@@ -176,23 +175,6 @@
 - (void)addClientFlags:(SPMySQLClientFlags)opts;
 - (void)removeClientFlags:(SPMySQLClientFlags)opts;
 
-/**
- * This tells the mysql client whether the cleartext auth plugin is permitted.
- *
- * If enabled, and requested by the server, the password will simply be transmitted
- * in plaintext, instead of hashing it on the client first, thus this plugin is
- * rather risky. It is mostly used when the server has to forward the password to another
- * auth backend (which it can't do with the one-way hash).
- *
- * If it is not enabled, but requested by the server the connection will fail with
- * error "plugin not enabled (2059)"
- *
- * WARNING: There are 2 ways to enable this plugin: Via this property or by setting
- * the envvar LIBMYSQL_ENABLE_CLEARTEXT_PLUGIN to 1. Sadly ANY ONE of those two is
- * sufficient to enable the plugin.
- */
-@property (readwrite, assign, nonatomic) BOOL allowCleartextPlugin;
-
 #pragma mark -
 #pragma mark Connection and disconnection