diff options
| -rw-r--r-- | Frameworks/MCPKit/MySQL/include/mysql_version.h | 4 | ||||
| -rw-r--r-- | Frameworks/MCPKit/MySQL/lib/libmysqlclient.a | bin | 2677984 -> 1900100 bytes | |||
| -rw-r--r-- | Frameworks/MCPKit/MySQL/lib/libmysqlclient_r.a | bin | 2733824 -> 1933524 bytes | |||
| -rwxr-xr-x | Scripts/build-mysql-client.sh | 16 |
4 files changed, 10 insertions, 10 deletions
diff --git a/Frameworks/MCPKit/MySQL/include/mysql_version.h b/Frameworks/MCPKit/MySQL/include/mysql_version.h index 3f0a5073..4cb3f2c2 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.36" +#define MYSQL_SERVER_VERSION "5.1.44" #define MYSQL_BASE_VERSION "mysqld-5.1" #define MYSQL_SERVER_SUFFIX_DEF "" #define FRM_VER 6 -#define MYSQL_VERSION_ID 50136 +#define MYSQL_VERSION_ID 50144 #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 Binary files differindex a7c3e213..c4a5bdca 100644 --- a/Frameworks/MCPKit/MySQL/lib/libmysqlclient.a +++ b/Frameworks/MCPKit/MySQL/lib/libmysqlclient.a diff --git a/Frameworks/MCPKit/MySQL/lib/libmysqlclient_r.a b/Frameworks/MCPKit/MySQL/lib/libmysqlclient_r.a Binary files differindex 1cb1676d..58d05c93 100644 --- a/Frameworks/MCPKit/MySQL/lib/libmysqlclient_r.a +++ b/Frameworks/MCPKit/MySQL/lib/libmysqlclient_r.a diff --git a/Scripts/build-mysql-client.sh b/Scripts/build-mysql-client.sh index 09e373f2..1d0464e3 100755 --- a/Scripts/build-mysql-client.sh +++ b/Scripts/build-mysql-client.sh @@ -17,8 +17,8 @@ DEBUG='NO' CLEAN='NO' # C/C++ compiler flags -export CFLAGS='-arch ppc -arch i386 -arch ppc64 -arch x86_64 -O3 -fno-omit-frame-pointer' -export CXXFLAGS='-arch ppc -arch i386 -arch ppc64 -arch x86_64 -O3 -fno-omit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti' +export CFLAGS='-isysroot /Developer/SDKs/MacOSX10.5.sdk -arch ppc -arch i386 -arch x86_64 -O3 -fno-omit-frame-pointer -mmacosx-version-min=10.5' +export CXXFLAGS='-isysroot /Developer/SDKs/MacOSX10.5.sdk -arch ppc -arch i386 -arch x86_64 -O3 -fno-omit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti -mmacosx-version-min=10.5' CONFIGURE_OPTIONS='--without-server --enable-thread-safe-client --disable-dependency-tracking' BINARY_DISTRIBUTION_SCRIPT='scripts/make_binary_distribution' @@ -44,8 +44,8 @@ then fi echo '' -echo "This script builds the MySQL client libraries for distrubution in Sequel Pro's MCPKit MySQL framework." -echo 'The are all built as 4-way (32/64 bit, i386/PPC arch) binaries.' +echo "This script builds the MySQL client libraries for distribution in Sequel Pro's MCPKit MySQL framework." +echo 'They are all built as 3-way binaries (32 bit PPC, 32/64 bit i386).' echo '' echo -n 'This may take a while, are you sure you want to continue [y | n]: ' @@ -111,9 +111,9 @@ fi if [ $? -eq 0 ] then - echo 'Bulding libraries successfully completed' + echo 'Building libraries successfully completed' else - echo 'Bulding libraries failed. Exiting...' + echo 'Building libraries failed. Exiting...' exit 1 fi @@ -128,9 +128,9 @@ fi if [ $? -eq 0 ] then - echo 'Bulding binary distribution successfully completed' + echo 'Building binary distribution successfully completed' else - echo 'Bulding binary distribution failed. Exiting...' + echo 'Building binary distribution failed. Exiting...' exit 1 fi |