github-migration/mysqlplus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

allow the 19_non_gvl branch to work with 1.8, also fix some warnings

Browse Source
This commit is contained in:
Roger Pack 2008-10-31 12:37:00 -06:00
parent 1404c2bc44
commit 8099da577d
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ext/mysql.c
View File

@ -327,7 +327,7 @@ static VALUE real_connect(int argc, VALUE* argv, VALUE klass) /* actually gets r
#ifdef HAVE_TBR #ifdef HAVE_TBR
if( (int) rb_thread_blocking_region_variable_params(10, &mysql_real_connect, 8, &myp->handler, h, u, p, d, pp, s, f) == NULL) if( (int) rb_thread_blocking_region_variable_params(10, &mysql_real_connect, 8, &myp->handler, h, u, p, d, pp, s, f) == NULL)
#else #else
if(mysql_real_connect if(mysql_real_connect(&myp->handler, h, u, p, d, pp, s, f) == NULL)
#endif #endif
#elif MYSQL_VERSION_ID >= 32115 #elif MYSQL_VERSION_ID >= 32115
if (mysql_real_connect(&myp->handler, h, u, p, pp, s, f) == NULL) if (mysql_real_connect(&myp->handler, h, u, p, pp, s, f) == NULL)
@ -862,8 +862,13 @@ static VALUE socket(VALUE obj)
static VALUE socket_type(VALUE obj) static VALUE socket_type(VALUE obj)
{ {
MYSQL* m = GetHandler(obj); MYSQL* m = GetHandler(obj);
char *answer;
VALUE description = vio_description( m->net.vio ); VALUE description = vio_description( m->net.vio );
return NILorSTRING( description ); answer = NILorSTRING( description );
if(answer)
return Qtrue; // TODO return a ruby string
else
return Qnil;
} }
/* blocking */ /* blocking */