[DRE-commits] [ruby-mysql2] 02/05: Merge tag 'upstream/0.4.2'

[zeha at debian.org]

This is an automated email from the git hooks/post-receive script.

zeha pushed a commit to branch master
in repository ruby-mysql2.

commit ba9bd873937d52354bec106f634331fc07bea649
Merge: f378e99 736196f
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Sat Dec 19 19:47:22 2015 +0000

    Merge tag 'upstream/0.4.2'
    
    Upstream version 0.4.2

 CHANGELOG.md                        |   1 +
 LICENSE                             |  21 +
 README.md                           |  75 +++-
 examples/eventmachine.rb            |   2 +-
 examples/threaded.rb                |  10 +-
 ext/mysql2/client.c                 | 345 ++++++++---------
 ext/mysql2/client.h                 |  22 +-
 ext/mysql2/extconf.rb               | 130 +++++--
 ext/mysql2/infile.c                 |   4 +-
 ext/mysql2/mysql2_ext.c             |   1 +
 ext/mysql2/mysql2_ext.h             |  11 +-
 ext/mysql2/mysql_enc_name_to_ruby.h |   4 +-
 ext/mysql2/mysql_enc_to_ruby.h      |  47 +--
 ext/mysql2/result.c                 | 626 +++++++++++++++++++++++-------
 ext/mysql2/result.h                 |  18 +-
 ext/mysql2/statement.c              | 494 ++++++++++++++++++++++++
 ext/mysql2/statement.h              |  19 +
 lib/mysql2.rb                       |  56 ++-
 lib/mysql2/client.rb                |  90 +++--
 lib/mysql2/console.rb               |   2 +-
 lib/mysql2/em.rb                    |  11 +-
 lib/mysql2/error.rb                 |  45 +--
 lib/mysql2/field.rb                 |   3 +
 lib/mysql2/statement.rb             |  17 +
 lib/mysql2/version.rb               |   2 +-
 metadata.yml                        |  87 ++---
 spec/em/em_spec.rb                  |  42 +-
 spec/mysql2/client_spec.rb          | 744 +++++++++++++++++++-----------------
 spec/mysql2/error_spec.rb           |  73 ++--
 spec/mysql2/result_spec.rb          | 421 ++++++++++----------
 spec/mysql2/statement_spec.rb       | 684 +++++++++++++++++++++++++++++++++
 spec/spec_helper.rb                 |   7 +
 spec/ssl/ca-cert.pem                |  17 +
 spec/ssl/ca-key.pem                 |  27 ++
 spec/ssl/ca.cnf                     |  22 ++
 spec/ssl/cert.cnf                   |  22 ++
 spec/ssl/client-cert.pem            |  17 +
 spec/ssl/client-key.pem             |  27 ++
 spec/ssl/client-req.pem             |  15 +
 spec/ssl/gen_certs.sh               |  48 +++
 spec/ssl/pkcs8-client-key.pem       |  28 ++
 spec/ssl/pkcs8-server-key.pem       |  28 ++
 spec/ssl/server-cert.pem            |  17 +
 spec/ssl/server-key.pem             |  27 ++
 spec/ssl/server-req.pem             |  15 +
 support/mysql_enc_to_ruby.rb        |  15 +-
 support/ruby_enc_to_mysql.rb        |   2 +-
 47 files changed, 3295 insertions(+), 1146 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-mysql2.git