[DRE-commits] [ruby-mysql2] 01/01: Merge tag 'upstream/0.3.15'

[Cédric Boutillier]

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

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

commit 98cfb9d1c9773f6b6515efdc11adb6ddafda54f1
Merge: cb3a2ce 675c1cb
Author: Cédric Boutillier <boutil at debian.org>
Date:   Sat Apr 5 16:27:52 2014 +0200

    Merge tag 'upstream/0.3.15'
    
    Upstream version 0.3.15
    
    Conflicts:
    	README.md
    	checksums.yaml.gz
    	ext/mysql2/client.c
    	ext/mysql2/client.h
    	ext/mysql2/result.c
    	lib/mysql2/version.rb
    	metadata.yml
    	spec/mysql2/client_spec.rb
    	spec/mysql2/error_spec.rb
    	spec/mysql2/result_spec.rb
    	spec/spec_helper.rb

 README.md                  |  90 +++++++++++++-----
 checksums.yaml.gz          | Bin 271 -> 268 bytes
 ext/mysql2/client.c        |  35 ++++---
 ext/mysql2/client.h        |   6 +-
 ext/mysql2/infile.c        | 119 ++++++++++++++++++++++++
 ext/mysql2/infile.h        |   1 +
 ext/mysql2/mysql2_ext.h    |   1 +
 ext/mysql2/result.c        |  27 +++---
 lib/mysql2/error.rb        |  78 ++++++++++++++--
 lib/mysql2/version.rb      |   2 +-
 metadata.yml               |   8 +-
 spec/mysql2/client_spec.rb | 134 +++++++++++++++++++++++----
 spec/mysql2/error_spec.rb  | 104 +++++++++++----------
 spec/mysql2/result_spec.rb | 225 ++++++++++++++++++++++++++-------------------
 spec/spec_helper.rb        |   9 ++
 spec/test_data             |   1 +
 16 files changed, 615 insertions(+), 225 deletions(-)

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