From 92dbef3a50da812666ac7543213452d6e0776d5e Mon Sep 17 00:00:00 2001 From: Aaron Stone Date: Sun, 12 Nov 2017 10:28:46 -0800 Subject: [PATCH 1/2] Include mysqld_error.h has been here for ages but was superfluous --- ext/mysql2/extconf.rb | 4 ++-- ext/mysql2/mysql2_ext.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ext/mysql2/extconf.rb b/ext/mysql2/extconf.rb index e7ccef5ec..043d001ed 100644 --- a/ext/mysql2/extconf.rb +++ b/ext/mysql2/extconf.rb @@ -105,8 +105,8 @@ def add_ssl_defines(header) asplode 'mysql.h' end -%w(errmsg.h mysqld_error.h).each do |h| - header = [prefix, h].compact.join '/' +%w(errmsg.h).each do |h| + header = [prefix, h].compact.join('/') asplode h unless have_header header end diff --git a/ext/mysql2/mysql2_ext.h b/ext/mysql2/mysql2_ext.h index 3995c3698..80063ed04 100644 --- a/ext/mysql2/mysql2_ext.h +++ b/ext/mysql2/mysql2_ext.h @@ -12,11 +12,9 @@ void Init_mysql2(void); #ifdef HAVE_MYSQL_H #include #include -#include #else #include #include -#include #endif #ifdef HAVE_RUBY_ENCODING_H From 8a8246670339fadbf05012fbf8ceefd7016d0cd2 Mon Sep 17 00:00:00 2001 From: Aaron Stone Date: Sun, 12 Nov 2017 10:47:25 -0800 Subject: [PATCH 2/2] Use keyserver.ubuntu.com for the Percona key --- .travis_mysql51.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis_mysql51.sh b/.travis_mysql51.sh index bc3da3dd6..d106b6464 100644 --- a/.travis_mysql51.sh +++ b/.travis_mysql51.sh @@ -5,7 +5,7 @@ set -eux apt-get purge -qq '^mysql*' '^libmysql*' rm -fr /etc/mysql rm -fr /var/lib/mysql -apt-key adv --keyserver keys.gnupg.net --recv-keys 8507EFA5 +apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-key 9334A25F8507EFA5 add-apt-repository 'deb http://repo.percona.com/apt precise main' apt-get update -qq apt-get install -qq percona-server-server-5.1 percona-server-client-5.1 libmysqlclient16-dev