From 8d8fbf94c3fc783a1becafb9efa6db8f4d0985f1 Mon Sep 17 00:00:00 2001 From: Aaron Stone Date: Sat, 11 Nov 2017 19:29:56 -0800 Subject: [PATCH 1/2] Include mysql_com.h has been here for ages but was superfluous --- ext/mysql2/mysql2_ext.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/ext/mysql2/mysql2_ext.h b/ext/mysql2/mysql2_ext.h index f53f4b4a1..3995c3698 100644 --- a/ext/mysql2/mysql2_ext.h +++ b/ext/mysql2/mysql2_ext.h @@ -11,12 +11,10 @@ void Init_mysql2(void); #ifdef HAVE_MYSQL_H #include -#include #include #include #else #include -#include #include #include #endif From 830dd7377baeb3d64457a74d670dfb026905be31 Mon Sep 17 00:00:00 2001 From: Aaron Stone Date: Sat, 11 Nov 2017 19:48:04 -0800 Subject: [PATCH 2/2] Check the server version instead of the client version of MySQL on OS X specs --- spec/mysql2/client_spec.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/mysql2/client_spec.rb b/spec/mysql2/client_spec.rb index c5ae66107..44c311db7 100644 --- a/spec/mysql2/client_spec.rb +++ b/spec/mysql2/client_spec.rb @@ -604,8 +604,8 @@ def run_gc end it "should handle Timeouts without leaving the connection hanging if reconnect is true" do - if RUBY_PLATFORM.include?('darwin') && Mysql2::Client.info.fetch(:version).start_with?('5.5') - pending('libmysqlclient 5.5 on OSX is afflicted by an unknown bug that breaks this test. See #633 and #634.') + if RUBY_PLATFORM.include?('darwin') && Mysql2::Client.server_info.fetch(:version).start_with?('5.5') + pending('MySQL 5.5 on OSX is afflicted by an unknown bug that breaks this test. See #633 and #634.') end client = new_client(:reconnect => true) @@ -615,8 +615,8 @@ def run_gc end it "should handle Timeouts without leaving the connection hanging if reconnect is set to true after construction" do - if RUBY_PLATFORM.include?('darwin') && Mysql2::Client.info.fetch(:version).start_with?('5.5') - pending('libmysqlclient 5.5 on OSX is afflicted by an unknown bug that breaks this test. See #633 and #634.') + if RUBY_PLATFORM.include?('darwin') && Mysql2::Client.server_info.fetch(:version).start_with?('5.5') + pending('MySQL 5.5 on OSX is afflicted by an unknown bug that breaks this test. See #633 and #634.') end client = new_client