diff options
| author | Max <post@wickenrode.com> | 2018-02-28 00:42:52 +0100 |
|---|---|---|
| committer | Max <post@wickenrode.com> | 2018-02-28 00:48:06 +0100 |
| commit | 808ae467381bf597c487fb321dbabc3ccb309b67 (patch) | |
| tree | 7f4f8e235f087f597113af0de8683335ff0efb65 /Frameworks/SPMySQLFramework/MySQL Client Libraries | |
| parent | d9f773eae0bf2d158012dfe55139ffdc6b1c57ff (diff) | |
| download | sequelpro-808ae467381bf597c487fb321dbabc3ccb309b67.tar.gz sequelpro-808ae467381bf597c487fb321dbabc3ccb309b67.tar.bz2 sequelpro-808ae467381bf597c487fb321dbabc3ccb309b67.zip | |
Reapply changes from rolled back commit that are common to master and callback-auth branches
This includes 3a944d7867c750c29e02e2619d72694bdbfb0b2a, 770c18901f82696d1233e0139e9bb3c4fbbcb90b, ca864a1f887feaf7ac6d35eeb55b265f3e630a09
Diffstat (limited to 'Frameworks/SPMySQLFramework/MySQL Client Libraries')
| -rw-r--r-- | Frameworks/SPMySQLFramework/MySQL Client Libraries/Patches/001-cpp-dependency.diff | 8 | ||||
| -rw-r--r-- | Frameworks/SPMySQLFramework/MySQL Client Libraries/Patches/002-new-types.diff | 9 |
2 files changed, 17 insertions, 0 deletions
diff --git a/Frameworks/SPMySQLFramework/MySQL Client Libraries/Patches/001-cpp-dependency.diff b/Frameworks/SPMySQLFramework/MySQL Client Libraries/Patches/001-cpp-dependency.diff index 06c20001..e3ce848a 100644 --- a/Frameworks/SPMySQLFramework/MySQL Client Libraries/Patches/001-cpp-dependency.diff +++ b/Frameworks/SPMySQLFramework/MySQL Client Libraries/Patches/001-cpp-dependency.diff @@ -1,3 +1,11 @@ +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 @@ diff --git a/Frameworks/SPMySQLFramework/MySQL Client Libraries/Patches/002-new-types.diff b/Frameworks/SPMySQLFramework/MySQL Client Libraries/Patches/002-new-types.diff index bb42f9d9..47aa9c6d 100644 --- a/Frameworks/SPMySQLFramework/MySQL Client Libraries/Patches/002-new-types.diff +++ b/Frameworks/SPMySQLFramework/MySQL Client Libraries/Patches/002-new-types.diff @@ -1,3 +1,12 @@ +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 @@ |