Merge pull request #398 from brianmario/rb_intern3-fix

Check for existence of rb_intern3 to try and get building on RBX again

Author: brianmario

.travis.yml

@@ -9,10 +9,6 @@ rvm:
   - rbx-19mode
   - rbx-20mode
 bundler_args: --without benchmarks
-matrix:
-  allow_failures:
-  - rvm: rbx-19mode
-  - rvm: rbx-20mode
 script:
   - bundle exec rake
   - bundle exec rspec

ext/mysql2/extconf.rb

@@ -9,6 +9,7 @@ def asplode lib
 have_func('rb_thread_blocking_region')
 have_func('rb_wait_for_single_fd')
 have_func('rb_hash_dup')
+have_func('rb_intern3')
 
 # borrowed from mysqlplus
 # http://github.com/oldmoe/mysqlplus/blob/master/ext/extconf.rb

ext/mysql2/result.c

@@ -129,7 +129,7 @@ static VALUE rb_mysql_result_fetch_field(VALUE self, unsigned int idx, short int
       memcpy(buf, field->name, field->name_length);
       buf[field->name_length] = 0;
 
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef HAVE_RB_INTERN3
       rb_field = rb_intern3(buf, field->name_length, rb_utf8_encoding());
       rb_field = ID2SYM(rb_field);
 #else

spec/mysql2/client_spec.rb

@@ -293,7 +293,7 @@ def connect *args
           mark[:END] = Time.now
           mark.include?(:USR1).should be_true
           (mark[:USR1] - mark[:START]).should >= 1
-          (mark[:USR1] - mark[:START]).should < 1.2
+          (mark[:USR1] - mark[:START]).should < 1.3
           (mark[:END] - mark[:USR1]).should > 0.9
           (mark[:END] - mark[:START]).should >= 2
           (mark[:END] - mark[:START]).should < 2.2