diff options
| author | rowanbeentje <rowan@beent.je> | 2010-04-27 23:53:59 +0000 |
|---|---|---|
| committer | rowanbeentje <rowan@beent.je> | 2010-04-27 23:53:59 +0000 |
| commit | d13c1ca4f3b24f3faa260d725459565347ca0d00 (patch) | |
| tree | fda4dbf9a9ac022a3b612fd2887ee104bf0cb549 | |
| parent | 43770a73682cea0c2f34092e56e5688678db0142 (diff) | |
| download | sequelpro-d13c1ca4f3b24f3faa260d725459565347ca0d00.tar.gz sequelpro-d13c1ca4f3b24f3faa260d725459565347ca0d00.tar.bz2 sequelpro-d13c1ca4f3b24f3faa260d725459565347ca0d00.zip | |
- Upgrade MySQL libraries to 5.1.46 (was 5.1.44)
- Alter build scripts to use --enable-local-infile as a configuration option; this addresses http://spbug.com/644
| -rw-r--r-- | Frameworks/MCPKit/MySQL/include/mysql_version.h | 4 | ||||
| -rw-r--r-- | Frameworks/MCPKit/MySQL/lib/libmysqlclient.a | bin | 1900100 -> 1900748 bytes | |||
| -rw-r--r-- | Frameworks/MCPKit/MySQL/lib/libmysqlclient_r.a | bin | 1933524 -> 1935244 bytes | |||
| -rwxr-xr-x | Scripts/build-mysql-client.sh | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/Frameworks/MCPKit/MySQL/include/mysql_version.h b/Frameworks/MCPKit/MySQL/include/mysql_version.h index 4cb3f2c2..7017707c 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.44" +#define MYSQL_SERVER_VERSION "5.1.46" #define MYSQL_BASE_VERSION "mysqld-5.1" #define MYSQL_SERVER_SUFFIX_DEF "" #define FRM_VER 6 -#define MYSQL_VERSION_ID 50144 +#define MYSQL_VERSION_ID 50146 #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 c4a5bdca..512d3b52 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 58d05c93..a9ae37fe 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 1d0464e3..3870162c 100755 --- a/Scripts/build-mysql-client.sh +++ b/Scripts/build-mysql-client.sh @@ -20,7 +20,7 @@ CLEAN='NO' 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' +CONFIGURE_OPTIONS='--without-server --enable-thread-safe-client --disable-dependency-tracking --enable-local-infile' BINARY_DISTRIBUTION_SCRIPT='scripts/make_binary_distribution' usage() |