mysql 2.7 → 2.8.1

data/History.txt

@@ -0,0 +1,12 @@
+=== 2.8.1 / 2009-08-21
+
+* New features:
+  * Early support for Ruby 1.9
+
+* Enhancements:
+  * Improved gem release process using Hoe as development dependency
+  * Implemented support for cross compilation
+  * Binary version built against MySQL 5.0.83
+
+* Bug fixes:
+  * Improved detection of mysql and it's configuration (mysql_config)

data/Manifest.txt

@@ -0,0 +1,16 @@
+COPYING
+COPYING.ja
+History.txt
+Manifest.txt
+README.txt
+Rakefile
+ext/mysql_api/extconf.rb
+ext/mysql_api/mysql.c
+extra/README.html
+extra/README_ja.html
+extra/tommy.css
+lib/mysql.rb
+tasks/gem.rake
+tasks/native.rake
+tasks/vendor_mysql.rake
+test/test_mysql.rb

data/README.txt

@@ -0,0 +1,23 @@
+= MySQL/Ruby Interface
+
+* http://mysql-win.rubyforge.org
+* http://rubyforge.org/projects/mysql-win
+* http://github.com/luislaven/mysql-gem
+
+== DESCRIPTION
+
+This is the MySQL API module for Ruby. It provides the same functions for Ruby
+programs that the MySQL C API provides for C programs.
+
+This is a conversion of tmtm's original extension into a proper RubyGems.
+
+=== Warning about incompatible MySQL versions
+
+Mixing MySQL versions will generate segmentation faults.
+
+Running the binary version of this gem against a different version of MySQL
+shared library <tt>libMySQL.dll</tt> will generate segmentation faults and
+terminate your application.
+
+Please use the exact same MAJOR.MINOR version of MySQL, see History.txt for
+specific version of MySQL used to build the binaries.

data/Rakefile

@@ -0,0 +1,22 @@
+#--
+# Copyright (c) 2008 Luis Lavena
+#
+# This source code is released under the MIT License.
+# See LICENSE file for details
+#++
+
+#
+# NOTE: Keep this file clean.
+# Add your customizations inside tasks directory.
+# Thank You.
+#
+
+begin
+  require 'rake'
+rescue LoadError
+  require 'rubygems'
+  require 'rake'
+end
+
+# load rakefile extensions (tasks)
+Dir['tasks/*.rake'].sort.each { |f| load f }

data/ext/mysql_api/extconf.rb

@@ -0,0 +1,98 @@
+# Darwin (OSX) special cases for universal binaries
+# This is to avoid the lack of UB binaries for MySQL
+if RUBY_PLATFORM =~ /darwin/
+  ENV["RC_ARCHS"] = `uname -m`.chomp if `uname -sr` =~ /^Darwin/
+ 
+  # On PowerPC the defaults are fine
+  ENV["RC_ARCHS"] = '' if `uname -m` =~ /^Power Macintosh/
+end
+
+require 'mkmf'
+
+# Improved detection of mysql_config
+# Code from DataObjects do_mysql adapter
+
+# All instances of mysql_config on PATH ...
+def mysql_config_paths
+  ENV['PATH'].split(File::PATH_SEPARATOR).collect do |path|
+    [ "#{path}/mysql_config", "#{path}/mysql_config5" ].
+      detect { |bin| File.exist?(bin) }
+  end
+end
+
+# The first mysql_config binary on PATH ...
+def default_mysql_config_path
+  mysql_config_paths.compact.first
+end
+
+# Allow overriding path to mysql_config on command line using:
+# ruby extconf.rb --with-mysql-config=/path/to/mysql_config
+if RUBY_PLATFORM =~ /mswin|mingw/
+  inc, lib = dir_config('mysql')
+  exit 1 unless have_library("libmysql")
+elsif mc = with_config('mysql-config', default_mysql_config_path) then
+  mc = 'mysql_config' if mc == true
+  cflags = `#{mc} --cflags`.chomp
+  exit 1 if $? != 0
+  libs = `#{mc} --libs`.chomp
+  exit 1 if $? != 0
+  $CPPFLAGS += ' ' + cflags
+  $libs = libs + " " + $libs
+else
+  inc, lib = dir_config('mysql', '/usr/local')
+  libs = ['m', 'z', 'socket', 'nsl', 'mygcc']
+  while not find_library('mysqlclient', 'mysql_query', lib, "#{lib}/mysql") do
+    exit 1 if libs.empty?
+    have_library(libs.shift)
+  end
+end
+
+have_func('mysql_ssl_set')
+have_func('rb_str_set_len')
+have_func('rb_thread_start_timer')
+
+if have_header('mysql.h') then
+  src = "#include <errmsg.h>\n#include <mysqld_error.h>\n"
+elsif have_header('mysql/mysql.h') then
+  src = "#include <mysql/errmsg.h>\n#include <mysql/mysqld_error.h>\n"
+else
+  exit 1
+end
+
+# make mysql constant
+File.open("conftest.c", "w") do |f|
+  f.puts src
+end
+if defined? cpp_command then
+  cpp = Config.expand(cpp_command(''))
+else
+  cpp = Config.expand sprintf(CPP, $CPPFLAGS, $CFLAGS, '')
+end
+if RUBY_PLATFORM =~ /mswin/ && !/-E/.match(cpp)
+  cpp << " -E"
+end
+unless system "#{cpp} > confout" then
+  exit 1
+end
+File.unlink "conftest.c"
+
+error_syms = []
+IO.foreach('confout') do |l|
+  next unless l =~ /errmsg\.h|mysqld_error\.h/
+  fn = l.split(/\"/)[1]
+  IO.foreach(fn) do |m|
+    if m =~ /^#define\s+([CE]R_[0-9A-Z_]+)/ then
+      error_syms << $1
+    end
+  end
+end
+File.unlink 'confout'
+error_syms.uniq!
+
+File.open('error_const.h', 'w') do |f|
+  error_syms.each do |s|
+    f.puts "    rb_define_mysql_const(#{s});"
+  end
+end
+
+create_makefile("mysql_api")

data/{mysql.c.in → ext/mysql_api/mysql.c}

@@ -1,9 +1,21 @@
 /*	ruby mysql module
- *	$Id: mysql.c.in,v 1.30 2005/08/21 15:15:38 tommy Exp $
+ *	$Id: mysql.c 244 2009-02-01 08:43:39Z tommy $
  */
 
-#include "ruby.h"
-#include "version.h"
+#include <ruby.h>
+#ifndef RSTRING_PTR
+#define RSTRING_PTR(str) RSTRING(str)->ptr
+#endif
+#ifndef RSTRING_LEN
+#define RSTRING_LEN(str) RSTRING(str)->len
+#endif
+#ifndef RARRAY_PTR
+#define RARRAY_PTR(ary) RARRAY(ary)->ptr
+#endif
+#ifndef HAVE_RB_STR_SET_LEN
+#define rb_str_set_len(str, length) (RSTRING_LEN(str) = (length))
+#endif
+
 #ifdef HAVE_MYSQL_H
 #include <mysql.h>
 #include <errmsg.h>
@@ -14,26 +26,10 @@
 #include <mysql/mysqld_error.h>
 #endif
 
-#define MYSQL_RUBY_VERSION 20700
+#define MYSQL_RUBY_VERSION 20801
 
 #define GC_STORE_RESULT_LIMIT 20
 
-#ifndef Qtrue		/* ruby 1.2.x ? */
-#define	Qtrue		TRUE
-#define	Qfalse		FALSE
-#define	rb_exc_raise	rb_raise
-#define	rb_exc_new2	exc_new2
-#define	rb_str_new	str_new
-#define	rb_str_new2	str_new2
-#define	rb_ary_new2	ary_new2
-#define	rb_ary_store	ary_store
-#define	rb_obj_alloc	obj_alloc
-#define	rb_hash_new	hash_new
-#define	rb_hash_aset	hash_aset
-#define	rb_eStandardError	eStandardError
-#define	rb_cObject	cObject
-#endif
-
 #if MYSQL_VERSION_ID < 32224
 #define	mysql_field_count	mysql_num_fields
 #endif
@@ -92,7 +88,7 @@ static void free_mysql(struct mysql* my)
 {
     if (my->connection == Qtrue)
 	mysql_close(&my->handler);
-    free(my);
+    xfree(my);
 }
 
 static void free_mysqlres(struct mysql_res* resp)
@@ -101,7 +97,7 @@ static void free_mysqlres(struct mysql_res* resp)
 	mysql_free_result(resp->res);
 	store_result_count--;
     }
-    free(resp);
+    xfree(resp);
 }
 
 #if MYSQL_VERSION_ID >= 40101
@@ -129,6 +125,7 @@ static void free_mysqlstmt_memory(struct mysql_stmt *s)
 	for (i = 0; i < s->result.n; i++) {
 	    if (s->result.bind[i].buffer)
 		xfree(s->result.bind[i].buffer);
+            s->result.bind[i].buffer = NULL;
 	}
 	xfree(s->result.bind);
 	s->result.bind = NULL;
@@ -144,6 +141,19 @@ static void free_mysqlstmt_memory(struct mysql_stmt *s)
     s->result.n = 0;
 }
 
+static void free_execute_memory(struct mysql_stmt *s)
+{
+    if (s->res && s->result.bind) {
+	int i;
+	for (i = 0; i < s->result.n; i++) {
+	    if (s->result.bind[i].buffer)
+		xfree(s->result.bind[i].buffer);
+            s->result.bind[i].buffer = NULL;
+	}
+    }
+    mysql_stmt_free_result(s->stmt);
+}
+
 static void free_mysqlstmt(struct mysql_stmt* s)
 {
     free_mysqlstmt_memory(s);
@@ -151,7 +161,7 @@ static void free_mysqlstmt(struct mysql_stmt* s)
 	mysql_stmt_close(s->stmt);
     if (s->res)
 	mysql_free_result(s->res);
-    free(s);
+    xfree(s);
 }
 #endif
 
@@ -170,6 +180,8 @@ static VALUE mysqlres2obj(MYSQL_RES* res)
     VALUE obj;
     struct mysql_res* resp;
     obj = Data_Make_Struct(cMysqlRes, struct mysql_res, 0, free_mysqlres, resp);
+    rb_iv_set(obj, "colname", Qnil);
+    rb_iv_set(obj, "tblcolname", Qnil);
     resp->res = res;
     resp->freed = Qfalse;
     rb_obj_call_init(obj, 0, NULL);
@@ -182,7 +194,6 @@ static VALUE mysqlres2obj(MYSQL_RES* res)
 static VALUE make_field_obj(MYSQL_FIELD* f)
 {
     VALUE obj;
-    VALUE hash;
     if (f == NULL)
 	return Qnil;
     obj = rb_obj_alloc(cMysqlField);
@@ -240,6 +251,9 @@ static VALUE real_connect(int argc, VALUE* argv, VALUE klass)
     pp = NILorINT(port);
     s = NILorSTRING(sock);
 
+#ifdef HAVE_RB_THREAD_START_TIMER
+    rb_thread_stop_timer();
+#endif
     obj = Data_Make_Struct(klass, struct mysql, 0, free_mysql, myp);
 #if MYSQL_VERSION_ID >= 32200
     mysql_init(&myp->handler);
@@ -249,7 +263,15 @@ static VALUE real_connect(int argc, VALUE* argv, VALUE klass)
 #else
     if (mysql_real_connect(&myp->handler, h, u, p, pp, s) == NULL)
 #endif
-	mysql_raise(&myp->handler);
+    {
+#ifdef HAVE_RB_THREAD_START_TIMER
+        rb_thread_start_timer();
+#endif
+        mysql_raise(&myp->handler);
+    }
+#ifdef HAVE_RB_THREAD_START_TIMER
+    rb_thread_start_timer();
+#endif
 
     myp->handler.reconnect = 0;
     myp->connection = Qtrue;
@@ -264,8 +286,8 @@ static VALUE escape_string(VALUE klass, VALUE str)
 {
     VALUE ret;
     Check_Type(str, T_STRING);
-    ret = rb_str_new(0, (RSTRING(str)->len)*2+1);
-    RSTRING(ret)->len = mysql_escape_string(RSTRING(ret)->ptr, RSTRING(str)->ptr, RSTRING(str)->len);
+    ret = rb_str_new(0, (RSTRING_LEN(str))*2+1);
+    rb_str_set_len(ret, mysql_escape_string(RSTRING_PTR(ret), RSTRING_PTR(str), RSTRING_LEN(str)));
     return ret;
 }
 
@@ -313,8 +335,18 @@ static VALUE real_connect2(int argc, VALUE* argv, VALUE obj)
     pp = NILorINT(port);
     s = NILorSTRING(sock);
 
-    if (mysql_real_connect(m, h, u, p, d, pp, s, f) == NULL)
-	mysql_raise(m);
+#ifdef HAVE_RB_THREAD_START_TIMER
+    rb_thread_stop_timer();
+#endif
+    if (mysql_real_connect(m, h, u, p, d, pp, s, f) == NULL) {
+#ifdef HAVE_RB_THREAD_START_TIMER
+        rb_thread_start_timer();
+#endif
+        mysql_raise(m);
+    }
+#ifdef HAVE_RB_THREAD_START_TIMER
+    rb_thread_start_timer();
+#endif
     m->reconnect = 0;
     GetMysqlStruct(obj)->connection = Qtrue;
 
@@ -398,8 +430,8 @@ static VALUE real_escape_string(VALUE obj, VALUE str)
     MYSQL* m = GetHandler(obj);
     VALUE ret;
     Check_Type(str, T_STRING);
-    ret = rb_str_new(0, (RSTRING(str)->len)*2+1);
-    RSTRING(ret)->len = mysql_real_escape_string(m, RSTRING(ret)->ptr, RSTRING(str)->ptr, RSTRING(str)->len);
+    ret = rb_str_new(0, (RSTRING_LEN(str))*2+1);
+    rb_str_set_len(ret, mysql_real_escape_string(m, RSTRING_PTR(ret), RSTRING_PTR(str), RSTRING_LEN(str)));
     return ret;
 }
 #endif
@@ -446,8 +478,6 @@ static VALUE my_close(VALUE obj)
 {
     MYSQL* m = GetHandler(obj);
     mysql_close(m);
-    if (mysql_errno(m))
-	mysql_raise(m);
     GetMysqlStruct(obj)->connection = Qfalse;
     return obj;
 }
@@ -700,14 +730,14 @@ static VALUE res_free(VALUE);
 /*	query(sql)	*/
 static VALUE query(VALUE obj, VALUE sql)
 {
+    int loop = 0;
     MYSQL* m = GetHandler(obj);
     Check_Type(sql, T_STRING);
+    if (GetMysqlStruct(obj)->connection == Qfalse) {
+        rb_raise(eMysql, "query: not connected");
+    }
     if (rb_block_given_p()) {
-#if MYSQL_VERSION_ID >= 40101
-        if (mysql_get_server_version(m) >= 40101 && mysql_set_server_option(m, MYSQL_OPTION_MULTI_STATEMENTS_ON) != 0)
-	    mysql_raise(m);
-#endif
-	if (mysql_real_query(m, RSTRING(sql)->ptr, RSTRING(sql)->len) != 0)
+	if (mysql_real_query(m, RSTRING_PTR(sql), RSTRING_LEN(sql)) != 0)
 	    mysql_raise(m);
 	do {
 	    MYSQL_RES* res = mysql_store_result(m);
@@ -718,15 +748,16 @@ static VALUE query(VALUE obj, VALUE sql)
 		VALUE robj = mysqlres2obj(res);
 		rb_ensure(rb_yield, robj, res_free, robj);
 	    }
-	}
 #if MYSQL_VERSION_ID >= 40101
-	while (mysql_next_result(m) == 0);
+	    if ((loop = mysql_next_result(m)) > 0)
+        	mysql_raise(m);
+	} while (loop == 0);
 #else
-	while (0);
+	} while (0);
 #endif
 	return obj;
     }
-    if (mysql_real_query(m, RSTRING(sql)->ptr, RSTRING(sql)->len) != 0)
+    if (mysql_real_query(m, RSTRING_PTR(sql), RSTRING_LEN(sql)) != 0)
 	mysql_raise(m);
     if (GetMysqlStruct(obj)->query_with_result == Qfalse)
 	return obj;
@@ -878,11 +909,7 @@ static VALUE query_with_result(VALUE obj)
 static VALUE query_with_result_set(VALUE obj, VALUE flag)
 {
     if (TYPE(flag) != T_TRUE && TYPE(flag) != T_FALSE)
-#if RUBY_VERSION_CODE < 160
-	TypeError("invalid type, required true or false.");
-#else
         rb_raise(rb_eTypeError, "invalid type, required true or false.");
-#endif
     GetMysqlStruct(obj)->query_with_result = flag;
     return flag;
 }
@@ -956,11 +983,7 @@ static VALUE fetch_field_direct(VALUE obj, VALUE nr)
     max = mysql_num_fields(res);
     n = NUM2INT(nr);
     if (n >= max)
-#if RUBY_VERSION_CODE < 160
-        Raise(eMysql, "%d: out of range (max: %d)", n, max-1);
-#else
         rb_raise(eMysql, "%d: out of range (max: %d)", n, max-1);
-#endif
 #if MYSQL_VERSION_ID >= 32226
     return make_field_obj(mysql_fetch_field_direct(res, n));
 #else
@@ -1020,19 +1043,40 @@ static VALUE fetch_hash2(VALUE obj, VALUE with_table)
     MYSQL_FIELD* fields = mysql_fetch_fields(res);
     unsigned int i;
     VALUE hash;
+    VALUE colname;
     if (row == NULL)
 	return Qnil;
     hash = rb_hash_new();
+
+    if (with_table == Qnil || with_table == Qfalse) {
+        colname = rb_iv_get(obj, "colname");
+        if (colname == Qnil) {
+            colname = rb_ary_new2(n);
+            for (i=0; i<n; i++) {
+                VALUE s = rb_tainted_str_new2(fields[i].name);
+                rb_obj_freeze(s);
+                rb_ary_store(colname, i, s);
+            }
+            rb_obj_freeze(colname);
+            rb_iv_set(obj, "colname", colname);
+        }
+    } else {
+        colname = rb_iv_get(obj, "tblcolname");
+        if (colname == Qnil) {
+            colname = rb_ary_new2(n);
+            for (i=0; i<n; i++) {
+                int len = strlen(fields[i].table)+strlen(fields[i].name)+1;
+                VALUE s = rb_tainted_str_new(NULL, len);
+                snprintf(RSTRING_PTR(s), len+1, "%s.%s", fields[i].table, fields[i].name);
+                rb_obj_freeze(s);
+                rb_ary_store(colname, i, s);
+            }
+            rb_obj_freeze(colname);
+            rb_iv_set(obj, "tblcolname", colname);
+        }
+    }
     for (i=0; i<n; i++) {
-	VALUE col;
-	if (with_table == Qnil || with_table == Qfalse)
-	    col = rb_tainted_str_new2(fields[i].name);
-	else {
-	    col = rb_tainted_str_new(fields[i].table, strlen(fields[i].table)+strlen(fields[i].name)+1);
-	    RSTRING(col)->ptr[strlen(fields[i].table)] = '.';
-	    strcpy(RSTRING(col)->ptr+strlen(fields[i].table)+1, fields[i].name);
-	}
-	rb_hash_aset(hash, col, row[i]? rb_tainted_str_new(row[i], lengths[i]): Qnil);
+        rb_hash_aset(hash, rb_ary_entry(colname, i), row[i]? rb_tainted_str_new(row[i], lengths[i]): Qnil);
     }
     return hash;
 }
@@ -1154,8 +1198,8 @@ static VALUE field_hash(VALUE obj)
 static VALUE field_inspect(VALUE obj)
 {
     VALUE n = rb_iv_get(obj, "name");
-    VALUE s = rb_str_new(0, RSTRING(n)->len + 16);
-    sprintf(RSTRING(s)->ptr, "#<Mysql::Field:%s>", RSTRING(n)->ptr);
+    VALUE s = rb_str_new(0, RSTRING_LEN(n) + 16);
+    sprintf(RSTRING_PTR(s), "#<Mysql::Field:%s>", RSTRING_PTR(n));
     return s;
 }
 
@@ -1257,7 +1301,6 @@ static VALUE stmt_attr_set(VALUE obj, VALUE opt, VALUE val)
 #endif
 
 /*	bind_result(bind,...)	*/
-static enum enum_field_types buffer_type(MYSQL_FIELD *field);
 static VALUE stmt_bind_result(int argc, VALUE *argv, VALUE obj)
 {
     struct mysql_stmt* s = DATA_PTR(obj);
@@ -1270,7 +1313,7 @@ static VALUE stmt_bind_result(int argc, VALUE *argv, VALUE obj)
     for (i = 0; i < argc; i++) {
 	if (argv[i] == Qnil || argv[i] == rb_cNilClass) {
 	    field = mysql_fetch_fields(s->res);
-	    s->result.bind[i].buffer_type = buffer_type(&field[i]);
+            s->result.bind[i].buffer_type = field[i].type;
 	}
 	else if (argv[i] == rb_cString)
 	    s->result.bind[i].buffer_type = MYSQL_TYPE_STRING;
@@ -1281,7 +1324,7 @@ static VALUE stmt_bind_result(int argc, VALUE *argv, VALUE obj)
 	else if (argv[i] == cMysqlTime)
 	    s->result.bind[i].buffer_type = MYSQL_TYPE_DATETIME;
 	else
-	    rb_raise(rb_eTypeError, "unrecognized class: %s", RSTRING(rb_inspect(argv[i]))->ptr);
+	    rb_raise(rb_eTypeError, "unrecognized class: %s", RSTRING_PTR(rb_inspect(argv[i])));
 	if (mysql_stmt_bind_result(s->stmt, s->result.bind))
 	    mysql_stmt_raise(s->stmt);
     }
@@ -1312,76 +1355,84 @@ static VALUE stmt_execute(int argc, VALUE *argv, VALUE obj)
 {
     struct mysql_stmt *s = DATA_PTR(obj);
     MYSQL_STMT *stmt = s->stmt;
-    my_bool true = 1;
-    my_bool false = 0;
     int i;
 
     check_stmt_closed(obj);
+    free_execute_memory(s);
     if (s->param.n != argc)
 	rb_raise(eMysql, "execute: param_count(%d) != number of argument(%d)", s->param.n, argc);
-    memset(s->param.bind, 0, sizeof(*(s->param.bind))*argc);
-    for (i = 0; i < argc; i++) {
-	switch (TYPE(argv[i])) {
-	case T_NIL:
-	    s->param.bind[i].buffer_type = MYSQL_TYPE_NULL;
-	    s->param.bind[i].is_null = &true;
-	    break;
-	case T_FIXNUM:
-	    s->param.bind[i].buffer_type = MYSQL_TYPE_LONG;
-	    s->param.bind[i].buffer = &(s->param.buffer[i]);
-	    *(long*)(s->param.bind[i].buffer) = FIX2INT(argv[i]);
-	    break;
-	case T_BIGNUM:
-	    s->param.bind[i].buffer_type = MYSQL_TYPE_LONGLONG;
-	    s->param.bind[i].buffer = &(s->param.buffer[i]);
-	    *(long long*)(s->param.bind[i].buffer) = rb_big2ll(argv[i]);
-	    break;
-	case T_FLOAT:
-	    s->param.bind[i].buffer_type = MYSQL_TYPE_DOUBLE;
-	    s->param.bind[i].buffer = &(s->param.buffer[i]);
-	    *(double*)(s->param.bind[i].buffer) = NUM2DBL(argv[i]);
-	    break;
-	case T_STRING:
-	    s->param.bind[i].buffer_type = MYSQL_TYPE_STRING;
-	    s->param.bind[i].buffer = RSTRING(argv[i])->ptr;
-	    s->param.bind[i].buffer_length = RSTRING(argv[i])->len;
-	    s->param.length[i] = RSTRING(argv[i])->len;
-	    s->param.bind[i].length = &(s->param.length[i]);
-	    break;
-	default:
-	    if (CLASS_OF(argv[i]) == rb_cTime) {
-		MYSQL_TIME t;
-		VALUE a = rb_funcall(argv[i], rb_intern("to_a"), 0);
-		s->param.bind[i].buffer_type = MYSQL_TYPE_DATETIME;
-		s->param.bind[i].buffer = &(s->param.buffer[i]);
-		t.second_part = 0;
-		t.neg = 0;
-		t.second = FIX2INT(RARRAY(a)->ptr[0]);
-		t.minute = FIX2INT(RARRAY(a)->ptr[1]);
-		t.hour = FIX2INT(RARRAY(a)->ptr[2]);
-		t.day = FIX2INT(RARRAY(a)->ptr[3]);
-		t.month = FIX2INT(RARRAY(a)->ptr[4]);
-		t.year = FIX2INT(RARRAY(a)->ptr[5]);
-		*(MYSQL_TIME*)&(s->param.buffer[i]) = t;
-	    } else if (CLASS_OF(argv[i]) == cMysqlTime) {
-		MYSQL_TIME t;
-		s->param.bind[i].buffer_type = MYSQL_TYPE_DATETIME;
-		s->param.bind[i].buffer = &(s->param.buffer[i]);
-		t.second_part = 0;
-		t.neg = 0;
-		t.second = NUM2INT(rb_iv_get(argv[i], "second"));
-		t.minute = NUM2INT(rb_iv_get(argv[i], "minute"));
-		t.hour = NUM2INT(rb_iv_get(argv[i], "hour"));
-		t.day = NUM2INT(rb_iv_get(argv[i], "day"));
-		t.month = NUM2INT(rb_iv_get(argv[i], "month"));
-		t.year = NUM2INT(rb_iv_get(argv[i], "year"));
-		*(MYSQL_TIME*)&(s->param.buffer[i]) = t;
-	    } else
-		rb_raise(rb_eTypeError, "unsupported type: %d", TYPE(argv[i]));
-	}
+    if (argc > 0) {
+        memset(s->param.bind, 0, sizeof(*(s->param.bind))*argc);
+        for (i = 0; i < argc; i++) {
+            switch (TYPE(argv[i])) {
+            case T_NIL:
+                s->param.bind[i].buffer_type = MYSQL_TYPE_NULL;
+                break;
+            case T_FIXNUM:
+#if SIZEOF_INT < SIZEOF_LONG
+                s->param.bind[i].buffer_type = MYSQL_TYPE_LONGLONG;
+                s->param.bind[i].buffer = &(s->param.buffer[i]);
+                *(LONG_LONG*)(s->param.bind[i].buffer) = FIX2LONG(argv[i]);
+#else
+                s->param.bind[i].buffer_type = MYSQL_TYPE_LONG;
+                s->param.bind[i].buffer = &(s->param.buffer[i]);
+                *(int*)(s->param.bind[i].buffer) = FIX2INT(argv[i]);
+#endif
+                break;
+            case T_BIGNUM:
+                s->param.bind[i].buffer_type = MYSQL_TYPE_LONGLONG;
+                s->param.bind[i].buffer = &(s->param.buffer[i]);
+                *(LONG_LONG*)(s->param.bind[i].buffer) = rb_big2ll(argv[i]);
+                break;
+            case T_FLOAT:
+                s->param.bind[i].buffer_type = MYSQL_TYPE_DOUBLE;
+                s->param.bind[i].buffer = &(s->param.buffer[i]);
+                *(double*)(s->param.bind[i].buffer) = NUM2DBL(argv[i]);
+                break;
+            case T_STRING:
+                s->param.bind[i].buffer_type = MYSQL_TYPE_STRING;
+                s->param.bind[i].buffer = RSTRING_PTR(argv[i]);
+                s->param.bind[i].buffer_length = RSTRING_LEN(argv[i]);
+                s->param.length[i] = RSTRING_LEN(argv[i]);
+                s->param.bind[i].length = &(s->param.length[i]);
+                break;
+            default:
+                if (CLASS_OF(argv[i]) == rb_cTime) {
+                    MYSQL_TIME t;
+                    VALUE a = rb_funcall(argv[i], rb_intern("to_a"), 0);
+                    s->param.bind[i].buffer_type = MYSQL_TYPE_DATETIME;
+                    s->param.bind[i].buffer = &(s->param.buffer[i]);
+                    memset(&t, 0, sizeof(t));    /* avoid warning */
+                    t.second_part = 0;
+                    t.neg = 0;
+                    t.second = FIX2INT(RARRAY_PTR(a)[0]);
+                    t.minute = FIX2INT(RARRAY_PTR(a)[1]);
+                    t.hour = FIX2INT(RARRAY_PTR(a)[2]);
+                    t.day = FIX2INT(RARRAY_PTR(a)[3]);
+                    t.month = FIX2INT(RARRAY_PTR(a)[4]);
+                    t.year = FIX2INT(RARRAY_PTR(a)[5]);
+                    *(MYSQL_TIME*)&(s->param.buffer[i]) = t;
+                } else if (CLASS_OF(argv[i]) == cMysqlTime) {
+                    MYSQL_TIME t;
+                    s->param.bind[i].buffer_type = MYSQL_TYPE_DATETIME;
+                    s->param.bind[i].buffer = &(s->param.buffer[i]);
+                    memset(&t, 0, sizeof(t));    /* avoid warning */
+                    t.second_part = 0;
+                    t.neg = 0;
+                    t.second = NUM2INT(rb_iv_get(argv[i], "second"));
+                    t.minute = NUM2INT(rb_iv_get(argv[i], "minute"));
+                    t.hour = NUM2INT(rb_iv_get(argv[i], "hour"));
+                    t.day = NUM2INT(rb_iv_get(argv[i], "day"));
+                    t.month = NUM2INT(rb_iv_get(argv[i], "month"));
+                    t.year = NUM2INT(rb_iv_get(argv[i], "year"));
+                    *(MYSQL_TIME*)&(s->param.buffer[i]) = t;
+                } else
+                    rb_raise(rb_eTypeError, "unsupported type: %d", TYPE(argv[i]));
+            }
+        }
+        if (mysql_stmt_bind_param(stmt, s->param.bind))
+            mysql_stmt_raise(stmt);
     }
-    if (mysql_stmt_bind_param(stmt, s->param.bind))
-	mysql_stmt_raise(stmt);
 
     if (mysql_stmt_execute(stmt))
 	mysql_stmt_raise(stmt);
@@ -1391,16 +1442,47 @@ static VALUE stmt_execute(int argc, VALUE *argv, VALUE obj)
 	    mysql_stmt_raise(stmt);
 	field = mysql_fetch_fields(s->res);
 	for (i = 0; i < s->result.n; i++) {
-	    if (s->result.bind[i].buffer_type == MYSQL_TYPE_STRING ||
-		s->result.bind[i].buffer_type == MYSQL_TYPE_BLOB) {
-		s->result.bind[i].buffer = xmalloc(field[i].max_length);
+            switch(s->result.bind[i].buffer_type) {
+            case MYSQL_TYPE_NULL:
+                break;
+            case MYSQL_TYPE_TINY:
+            case MYSQL_TYPE_SHORT:
+            case MYSQL_TYPE_YEAR:
+            case MYSQL_TYPE_INT24:
+            case MYSQL_TYPE_LONG:
+            case MYSQL_TYPE_LONGLONG:
+            case MYSQL_TYPE_FLOAT:
+            case MYSQL_TYPE_DOUBLE:
+                s->result.bind[i].buffer = xmalloc(8);
+                s->result.bind[i].buffer_length = 8;
+                memset(s->result.bind[i].buffer, 0, 8);
+                break;
+            case MYSQL_TYPE_DECIMAL:
+            case MYSQL_TYPE_STRING:
+            case MYSQL_TYPE_VAR_STRING:
+            case MYSQL_TYPE_TINY_BLOB:
+            case MYSQL_TYPE_BLOB:
+            case MYSQL_TYPE_MEDIUM_BLOB:
+            case MYSQL_TYPE_LONG_BLOB:
+#if MYSQL_VERSION_ID >= 50003
+            case MYSQL_TYPE_NEWDECIMAL:
+            case MYSQL_TYPE_BIT:
+#endif
+                s->result.bind[i].buffer = xmalloc(field[i].max_length);
                 memset(s->result.bind[i].buffer, 0, field[i].max_length);
-		s->result.bind[i].buffer_length = field[i].max_length;
-	    } else {
-		s->result.bind[i].buffer = xmalloc(sizeof(MYSQL_TIME));
-		s->result.bind[i].buffer_length = sizeof(MYSQL_TIME);
+                s->result.bind[i].buffer_length = field[i].max_length;
+                break;
+            case MYSQL_TYPE_TIME:
+            case MYSQL_TYPE_DATE:
+            case MYSQL_TYPE_DATETIME:
+            case MYSQL_TYPE_TIMESTAMP:
+                s->result.bind[i].buffer = xmalloc(sizeof(MYSQL_TIME));
+                s->result.bind[i].buffer_length = sizeof(MYSQL_TIME);
                 memset(s->result.bind[i].buffer, 0, sizeof(MYSQL_TIME));
-	    }
+                break;
+            default:
+                rb_raise(rb_eTypeError, "unknown buffer_type: %d", s->result.bind[i].buffer_type);
+            }
 	}
 	if (mysql_stmt_bind_result(s->stmt, s->result.bind))
 	    mysql_stmt_raise(s->stmt);
@@ -1420,6 +1502,10 @@ static VALUE stmt_fetch(VALUE obj)
     r = mysql_stmt_fetch(s->stmt);
     if (r == MYSQL_NO_DATA)
 	return Qnil;
+#ifdef MYSQL_DATA_TRUNCATED
+    if (r == MYSQL_DATA_TRUNCATED)
+        rb_raise(rb_eRuntimeError, "unexpectedly data truncated");
+#endif
     if (r == 1)
 	mysql_stmt_raise(s->stmt);
 
@@ -1431,34 +1517,66 @@ static VALUE stmt_fetch(VALUE obj)
 	    VALUE v;
 	    MYSQL_TIME *t;
 	    switch (s->result.bind[i].buffer_type) {
-	    case MYSQL_TYPE_LONG:
-		v = INT2NUM(*(long*)s->result.bind[i].buffer);
-		break;
-	    case MYSQL_TYPE_LONGLONG:
-		v = rb_ll2inum(*(long long*)s->result.bind[i].buffer);
-		break;
-	    case MYSQL_TYPE_DOUBLE:
-		v = rb_float_new(*(double*)s->result.bind[i].buffer);
-		break;
-	    case MYSQL_TYPE_TIMESTAMP:
-	    case MYSQL_TYPE_DATE:
-	    case MYSQL_TYPE_TIME:
-	    case MYSQL_TYPE_DATETIME:
-		t = (MYSQL_TIME*)s->result.bind[i].buffer;
-		v = rb_obj_alloc(cMysqlTime);
-		rb_funcall(v, rb_intern("initialize"), 8,
-			   INT2FIX(t->year), INT2FIX(t->month),
-			   INT2FIX(t->day), INT2FIX(t->hour),
-			   INT2FIX(t->minute), INT2FIX(t->second),
-			   (t->neg ? Qtrue : Qfalse),
-			   INT2FIX(t->second_part));
-		break;
-	    case MYSQL_TYPE_STRING:
-	    case MYSQL_TYPE_BLOB:
-		v = rb_tainted_str_new(s->result.bind[i].buffer, s->result.length[i]);
-		break;
-	    default:
-		rb_raise(rb_eTypeError, "unknown buffer_type: %d", s->result.bind[i].buffer_type);
+            case MYSQL_TYPE_TINY:
+                if (s->result.bind[i].is_unsigned)
+                    v = UINT2NUM(*(unsigned char *)s->result.bind[i].buffer);
+                else
+                    v = INT2NUM(*(signed char *)s->result.bind[i].buffer);
+                break;
+            case MYSQL_TYPE_SHORT:
+            case MYSQL_TYPE_YEAR:
+                if (s->result.bind[i].is_unsigned)
+                    v = UINT2NUM(*(unsigned short *)s->result.bind[i].buffer);
+                else
+                    v = INT2NUM(*(short *)s->result.bind[i].buffer);
+                break;
+            case MYSQL_TYPE_INT24:
+            case MYSQL_TYPE_LONG:
+                if (s->result.bind[i].is_unsigned)
+                    v = UINT2NUM(*(unsigned int *)s->result.bind[i].buffer);
+                else
+                    v = INT2NUM(*(int *)s->result.bind[i].buffer);
+                break;
+            case MYSQL_TYPE_LONGLONG:
+                if (s->result.bind[i].is_unsigned)
+                    v = ULL2NUM(*(unsigned long long *)s->result.bind[i].buffer);
+                else
+                    v = LL2NUM(*(long long *)s->result.bind[i].buffer);
+                break;
+            case MYSQL_TYPE_FLOAT:
+                v = rb_float_new((double)(*(float *)s->result.bind[i].buffer));
+                break;
+            case MYSQL_TYPE_DOUBLE:
+                v = rb_float_new(*(double *)s->result.bind[i].buffer);
+                break;
+            case MYSQL_TYPE_TIME:
+            case MYSQL_TYPE_DATE:
+            case MYSQL_TYPE_DATETIME:
+            case MYSQL_TYPE_TIMESTAMP:
+                t = (MYSQL_TIME *)s->result.bind[i].buffer;
+                v = rb_obj_alloc(cMysqlTime);
+                rb_funcall(v, rb_intern("initialize"), 8,
+                           INT2FIX(t->year), INT2FIX(t->month),
+                           INT2FIX(t->day), INT2FIX(t->hour),
+                           INT2FIX(t->minute), INT2FIX(t->second),
+                           (t->neg ? Qtrue : Qfalse),
+                           INT2FIX(t->second_part));
+                break;
+            case MYSQL_TYPE_DECIMAL:
+            case MYSQL_TYPE_STRING:
+            case MYSQL_TYPE_VAR_STRING:
+            case MYSQL_TYPE_TINY_BLOB:
+            case MYSQL_TYPE_BLOB:
+            case MYSQL_TYPE_MEDIUM_BLOB:
+            case MYSQL_TYPE_LONG_BLOB:
+#if MYSQL_VERSION_ID >= 50003
+            case MYSQL_TYPE_NEWDECIMAL:
+            case MYSQL_TYPE_BIT:
+#endif
+                v = rb_tainted_str_new(s->result.bind[i].buffer, s->result.length[i]);
+                break;
+            default:
+                rb_raise(rb_eTypeError, "unknown buffer_type: %d", s->result.bind[i].buffer_type);
 	    }
 	    rb_ary_push(ret, v);
 	}
@@ -1491,10 +1609,6 @@ static VALUE stmt_free_result(VALUE obj)
 {
     struct mysql_stmt* s = DATA_PTR(obj);
     check_stmt_closed(obj);
-    if (s->res) {
-	mysql_free_result(s->res);
-	s->res = NULL;
-    }
     if (mysql_stmt_free_result(s->stmt))
 	mysql_stmt_raise(s->stmt);
     return obj;
@@ -1531,46 +1645,6 @@ static VALUE stmt_param_count(VALUE obj)
 }
 
 /*	prepare(query)	*/
-static enum enum_field_types buffer_type(MYSQL_FIELD *field)
-{
-    switch (field->type) {
-    case FIELD_TYPE_TINY:
-    case FIELD_TYPE_SHORT:
-    case FIELD_TYPE_INT24:
-    case FIELD_TYPE_YEAR:
-	return MYSQL_TYPE_LONG;
-    case FIELD_TYPE_LONG:
-    case FIELD_TYPE_LONGLONG:
-	return MYSQL_TYPE_LONGLONG;
-    case FIELD_TYPE_FLOAT:
-    case FIELD_TYPE_DOUBLE:
-	return MYSQL_TYPE_DOUBLE;
-    case FIELD_TYPE_TIMESTAMP:
-	return MYSQL_TYPE_TIMESTAMP;
-    case FIELD_TYPE_DATE:
-	return MYSQL_TYPE_DATE;
-    case FIELD_TYPE_TIME:
-	return MYSQL_TYPE_TIME;
-    case FIELD_TYPE_DATETIME:
-	return MYSQL_TYPE_DATETIME;
-    case FIELD_TYPE_STRING:
-    case FIELD_TYPE_VAR_STRING:
-    case FIELD_TYPE_SET:
-    case FIELD_TYPE_ENUM:
-    case FIELD_TYPE_DECIMAL:
-#if MYSQL_VERSION_ID >= 50003
-    case FIELD_TYPE_NEWDECIMAL:
-#endif
-	return MYSQL_TYPE_STRING;
-    case FIELD_TYPE_BLOB:
-	return MYSQL_TYPE_BLOB;
-    case FIELD_TYPE_NULL:
-	return MYSQL_TYPE_NULL;
-    default:
-	rb_raise(rb_eTypeError, "unknown type: %d", field->type);
-    }
-}
-
 static VALUE stmt_prepare(VALUE obj, VALUE query)
 {
     struct mysql_stmt* s = DATA_PTR(obj);
@@ -1581,7 +1655,7 @@ static VALUE stmt_prepare(VALUE obj, VALUE query)
     free_mysqlstmt_memory(s);
     check_stmt_closed(obj);
     Check_Type(query, T_STRING);
-    if (mysql_stmt_prepare(s->stmt, RSTRING(query)->ptr, RSTRING(query)->len))
+    if (mysql_stmt_prepare(s->stmt, RSTRING_PTR(query), RSTRING_LEN(query)))
 	mysql_stmt_raise(s->stmt);
 
     n = mysql_stmt_param_count(s->stmt);
@@ -1599,9 +1673,14 @@ static VALUE stmt_prepare(VALUE obj, VALUE query)
 	field = mysql_fetch_fields(s->res);
 	memset(s->result.bind, 0, sizeof(s->result.bind[0]) * n);
 	for (i = 0; i < n; i++) {
-	    s->result.bind[i].buffer_type = buffer_type(&field[i]);
+            s->result.bind[i].buffer_type = field[i].type;
+#if MYSQL_VERSION_ID < 50003
+            if (field[i].type == MYSQL_TYPE_DECIMAL)
+                s->result.bind[i].buffer_type = MYSQL_TYPE_STRING;
+#endif
 	    s->result.bind[i].is_null = &(s->result.is_null[i]);
 	    s->result.bind[i].length = &(s->result.length[i]);
+            s->result.bind[i].is_unsigned = ((field[i].flags & UNSIGNED_FLAG) != 0);
 	}
     } else {
 	if (mysql_stmt_errno(s->stmt))
@@ -1630,8 +1709,11 @@ static VALUE stmt_result_metadata(VALUE obj)
     MYSQL_RES *res;
     check_stmt_closed(obj);
     res = mysql_stmt_result_metadata(s->stmt);
-    if (res == NULL && mysql_stmt_errno(s->stmt) != 0)
+    if (res == NULL) {
+      if (mysql_stmt_errno(s->stmt) != 0)
 	mysql_stmt_raise(s->stmt);
+      return Qnil;
+    }
     return mysqlres2obj(res);
 }
 
@@ -1670,7 +1752,7 @@ static VALUE stmt_send_long_data(VALUE obj, VALUE col, VALUE data)
 	if (mysql_stmt_bind_param(s->stmt, s->param.bind))
 	    mysql_stmt_raise(s->stmt);
     }
-    if (mysql_stmt_send_long_data(s->stmt, c, RSTRING(data)->ptr, RSTRING(data)->len))
+    if (mysql_stmt_send_long_data(s->stmt, c, RSTRING_PTR(data), RSTRING_LEN(data)))
 	mysql_stmt_raise(s->stmt);
     return obj;
 }
@@ -1700,6 +1782,7 @@ static VALUE time_initialize(int argc, VALUE* argv, VALUE obj)
     rb_iv_set(obj, "second", NILorFIXvalue(second));
     rb_iv_set(obj, "neg", (neg == Qnil || neg == Qfalse) ? Qfalse : Qtrue);
     rb_iv_set(obj, "second_part", NILorFIXvalue(second_part));
+    return obj;
 }
 
 static VALUE time_inspect(VALUE obj)
@@ -1799,7 +1882,7 @@ static VALUE error_sqlstate(VALUE obj)
  *	Initialize
  */
 
-void Init_mysql(void)
+void Init_mysql_api(void)
 {
     cMysql = rb_define_class("Mysql", rb_cObject);
     cMysqlRes = rb_define_class_under(cMysql, "Result", rb_cObject);
@@ -2080,6 +2163,10 @@ void Init_mysql(void)
     rb_define_const(cMysqlField, "TYPE_DATETIME", INT2NUM(FIELD_TYPE_DATETIME));
 #if MYSQL_VERSION_ID >= 32130
     rb_define_const(cMysqlField, "TYPE_YEAR", INT2NUM(FIELD_TYPE_YEAR));
+#endif
+#if MYSQL_VERSION_ID >= 50003
+    rb_define_const(cMysqlField, "TYPE_BIT", INT2NUM(FIELD_TYPE_BIT));
+    rb_define_const(cMysqlField, "TYPE_NEWDECIMAL", INT2NUM(FIELD_TYPE_NEWDECIMAL));
 #endif
     rb_define_const(cMysqlField, "TYPE_SET", INT2NUM(FIELD_TYPE_SET));
     rb_define_const(cMysqlField, "TYPE_BLOB", INT2NUM(FIELD_TYPE_BLOB));
@@ -2181,4 +2268,6 @@ void Init_mysql(void)
     rb_define_method(eMysql, "sqlstate", error_sqlstate, 0);
 
     /* Mysql::Error constant */
+#define rb_define_mysql_const(s) rb_define_const(eMysql, #s, INT2NUM(s))
+#include "error_const.h"
 }