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

overcome another merge conflict

This commit is contained in:
Roger Pack 2008-09-30 17:04:06 -06:00
parent 63114d674c
commit ee9cf7c47e
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/extconf.rb
View File

@ -35,7 +35,7 @@ end
# check for 1.9 # check for 1.9
if have_func('rb_thread_blocking_region') and have_macro('RUBY_UBF_IO', 'ruby.h') if have_func('rb_thread_blocking_region') and have_macro('RUBY_UBF_IO', 'ruby.h')
$CFLAGS += " -DHAVE_TBR " $CFLAGS += " -DHAVE_TBR "
$CPPFLAGS << " -DHAVE_TBR" $CPPFLAGS << " -DHAVE_TBR "
end end
# make mysql constant # make mysql constant

10
ext/mysql.c
View File

@ -231,8 +231,13 @@ static VALUE init(VALUE klass)
return obj; return obj;
} }
#if MYSQL_VERSION_ID >= 32200
int mysql_real_connect_nonblocking() {}
#endif
/* real_connect(host=nil, user=nil, passwd=nil, db=nil, port=nil, sock=nil, flag=nil) */ /* real_connect(host=nil, user=nil, passwd=nil, db=nil, port=nil, sock=nil, flag=nil) */
static VALUE real_connect(int argc, VALUE* argv, VALUE klass) static VALUE real_connect(int argc, VALUE* argv, VALUE klass) /* actually gets run */
{ {
VALUE host, user, passwd, db, port, sock, flag; VALUE host, user, passwd, db, port, sock, flag;
char *h, *u, *p, *d, *s; char *h, *u, *p, *d, *s;
@ -258,7 +263,7 @@ static VALUE real_connect(int argc, VALUE* argv, VALUE klass)
obj = Data_Make_Struct(klass, struct mysql, 0, free_mysql, myp); obj = Data_Make_Struct(klass, struct mysql, 0, free_mysql, myp);
#if MYSQL_VERSION_ID >= 32200 #if MYSQL_VERSION_ID >= 32200
mysql_init(&myp->handler); mysql_init(&myp->handler); /* we get here */
if (mysql_real_connect(&myp->handler, h, u, p, d, pp, s, f) == NULL) if (mysql_real_connect(&myp->handler, h, u, p, d, pp, s, f) == NULL)
#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)
@ -324,6 +329,7 @@ static VALUE client_version(VALUE obj)
/* real_connect(host=nil, user=nil, passwd=nil, db=nil, port=nil, sock=nil, flag=nil) */ /* real_connect(host=nil, user=nil, passwd=nil, db=nil, port=nil, sock=nil, flag=nil) */
static VALUE real_connect2(int argc, VALUE* argv, VALUE obj) static VALUE real_connect2(int argc, VALUE* argv, VALUE obj)
{ {
printf("conn2\n");
VALUE host, user, passwd, db, port, sock, flag; VALUE host, user, passwd, db, port, sock, flag;
char *h, *u, *p, *d, *s; char *h, *u, *p, *d, *s;
unsigned int pp, f; unsigned int pp, f;