[binaryphp-cvs] binaryphp/functions/mysql mysql_connect.cpp,1.1,1.2 mysql_error.cpp,1.1,1.2 mysql_fetch_array.cpp,1.1,1.2 mysql_fetch_row.cpp,1.1,1.2 mysql_query.cpp,1.1,1.2

[<he...@us...>]

Update of /cvsroot/binaryphp/binaryphp/functions/mysql
In directory sc8-pr-cvs1:/tmp/cvs-serv31463/functions/mysql

Modified Files:
	mysql_connect.cpp mysql_error.cpp mysql_fetch_array.cpp 
	mysql_fetch_row.cpp mysql_query.cpp 
Log Message:
Fixed MySQL functions.

Index: mysql_connect.cpp
===================================================================
RCS file: /cvsroot/binaryphp/binaryphp/functions/mysql/mysql_connect.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mysql_connect.cpp	3 Aug 2003 06:36:03 -0000	1.1
--- mysql_connect.cpp	7 Aug 2003 01:37:52 -0000	1.2
***************
*** 1,10 ****
  php_var mysql_connect(php_var host = "localhost:3306", php_var user = "", php_var passwd = "")
  {
! 	MYSQL* mysql;
! 	mysql_init(mysql);
  	unsigned int port = 3306;
! 	if(!mysql_real_connect(mysql, host, user.container.c_str(), passwd.container.c_str(), NULL, port, host_ext[1].container.c_str(), 0))
  	{
! 		//handle errors
  	}
  	php_var ret;
--- 1,12 ----
  php_var mysql_connect(php_var host = "localhost:3306", php_var user = "", php_var passwd = "")
  {
! 	MYSQL* mysql = NULL;
! 	mysql = mysql_init(mysql);
  	unsigned int port = 3306;
! 	if(!mysql_real_connect(mysql, host.container.c_str(), user.container.c_str(), passwd.container.c_str(), NULL, port, NULL, 0))
  	{
! 		global_mysql.res = (void*)mysql;
! 		global_mysql.type = PHP_RESOURCE;
! 		return (php_var)false;
  	}
  	php_var ret;

Index: mysql_error.cpp
===================================================================
RCS file: /cvsroot/binaryphp/binaryphp/functions/mysql/mysql_error.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mysql_error.cpp	3 Aug 2003 06:36:03 -0000	1.1
--- mysql_error.cpp	7 Aug 2003 01:37:53 -0000	1.2
***************
*** 1,5 ****
  php_var mysql_error(php_var mysql = global_mysql)
  {
! 	php_var ret = mysql_error(mysql);
! 	return ret;
  }
--- 1,4 ----
  php_var mysql_error(php_var mysql = global_mysql)
  {
! 	return (php_var)mysql_error((MYSQL*)mysql.res);
  }

Index: mysql_fetch_array.cpp
===================================================================
RCS file: /cvsroot/binaryphp/binaryphp/functions/mysql/mysql_fetch_array.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mysql_fetch_array.cpp	3 Aug 2003 06:36:03 -0000	1.1
--- mysql_fetch_array.cpp	7 Aug 2003 01:37:53 -0000	1.2
***************
*** 4,13 ****
  	unsigned int num_fields;
  	MYSQL_ROW row;
! 	MYSQL_FIELD* fields;
  	if(row = mysql_fetch_row((MYSQL_RES*)result.res))
  	{
  		ret = array();
  		num_fields = mysql_num_fields((MYSQL_RES*)result.res);
!         fields = mysql_fetch_fields((MYSQL_RES*)result.res);
  		int i;
  		for(i = 0; i < num_fields; ++i)
--- 4,14 ----
  	unsigned int num_fields;
  	MYSQL_ROW row;
! 	MYSQL_FIELD* fields = NULL;
  	if(row = mysql_fetch_row((MYSQL_RES*)result.res))
  	{
  		ret = array();
  		num_fields = mysql_num_fields((MYSQL_RES*)result.res);
! 		if(result_type == MYSQL_ASSOC || result_type == MYSQL_BOTH)
!         	fields = mysql_fetch_fields((MYSQL_RES*)result.res);
  		int i;
  		for(i = 0; i < num_fields; ++i)

Index: mysql_fetch_row.cpp
===================================================================
RCS file: /cvsroot/binaryphp/binaryphp/functions/mysql/mysql_fetch_row.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mysql_fetch_row.cpp	3 Aug 2003 06:36:03 -0000	1.1
--- mysql_fetch_row.cpp	7 Aug 2003 01:37:53 -0000	1.2
***************
*** 14,17 ****
  	}
  	else
! 		return((php_var)false);
  }
--- 14,17 ----
  	}
  	else
! 		return (php_var)false;
  }

Index: mysql_query.cpp
===================================================================
RCS file: /cvsroot/binaryphp/binaryphp/functions/mysql/mysql_query.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mysql_query.cpp	3 Aug 2003 06:36:03 -0000	1.1
--- mysql_query.cpp	7 Aug 2003 01:37:53 -0000	1.2
***************
*** 5,13 ****
  	if(mysql_real_query((MYSQL*)mysql.res, query.container.c_str(),query.container.length()) != 0)
  	{
! 		return (php_var) false;
  	}
  	else
  	{
! 		result = mysql_store_result((MYSQL*) (mysql.res));
  		if(result)
  		{
--- 5,13 ----
  	if(mysql_real_query((MYSQL*)mysql.res, query.container.c_str(),query.container.length()) != 0)
  	{
! 		return (php_var)false;
  	}
  	else
  	{
! 		result = mysql_store_result((MYSQL*)mysql.res);
  		if(result)
  		{
***************
*** 18,25 ****
  		else
  		{
! 			if(mysql_field_count((MYSQL *) mysql.res) == 0)
! 				return((php_var)true);
  			else
! 				return((php_var)false);
  		}
  	}
--- 18,25 ----
  		else
  		{
! 			if(mysql_field_count((MYSQL*)mysql.res) == 0)
! 				return (php_var)true;
  			else
! 				return (php_var)false;
  		}
  	}