Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Include mysqld_error.h has been here for ages but was superfluous #902

Merged
merged 2 commits into from
Nov 12, 2017
Merged

Include mysqld_error.h has been here for ages but was superfluous #902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92dbef3
Include mysqld_error.h has been here for ages but was superfluous
sodabrew Nov 12, 2017
8a82466
Use keyserver.ubuntu.com for the Percona key
sodabrew Nov 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis_mysql51.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions ext/mysql2/extconf.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 0 additions & 2 deletions ext/mysql2/mysql2_ext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,9 @@ void Init_mysql2(void);
#ifdef HAVE_MYSQL_H
#include <mysql.h>
#include <errmsg.h>
#include <mysqld_error.h>
#else
#include <mysql/mysql.h>
#include <mysql/errmsg.h>
#include <mysql/mysqld_error.h>
#endif

#ifdef HAVE_RUBY_ENCODING_H
Expand Down