cvs: php4 /ext/mysql php_mysql.c

zeev Wed Nov 8 00:27:27 2000 EDT Modified files: /php4/ext/mysql php_mysql.c Log: Will work on a more thorough implementation for mysql_store_result() after 4.0.4 Index: php4/ext/mysql/php_mysql.c diff -u php4/ext/mysql/php_mysql.c:1.59 php4/ext/mysql/php_mysql.c:1.60 --- php4/ext/mysql/php_mysql.c:1.59 Tue Nov 7 07:46:15 2000 +++ php4/ext/mysql/php_mysql.c Wed Nov 8 00:27:27 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.59 2000/11/07 15:46:15 stas Exp $ */ +/* $Id: php_mysql.c,v 1.60 2000/11/08 08:27:27 zeev Exp $ */ /* TODO: @@ -771,6 +771,7 @@ } id = -1; break; +#if 0 /* need to work more on the mysql_store_result() approach */ case 3: if(zend_get_parameters_ex(3, &query, &mysql_link, &store_result)==FAILURE) { RETURN_FALSE; @@ -781,6 +782,7 @@ } id = -1; break; +#endif default: WRONG_PARAM_COUNT; break; @@ -804,7 +806,7 @@ } else { mysql_result=mysql_store_result(mysql); } - if (mysql_result==NULL) { + if (!mysql_result) { if (PHP_MYSQL_VALID_RESULT(mysql)) { /* query should have returned rows */ php_error(E_WARNING, "MySQL: Unable to save result set"); RETURN_FALSE; @@ -841,6 +843,7 @@ } id = -1; break; +#if 0 case 4: if(zend_get_parameters_ex(4, &db, &query, &mysql_link, &store_result)==FAILURE) { RETURN_FALSE; @@ -851,6 +854,7 @@ } id = -1; break; +#endif default: WRONG_PARAM_COUNT; break; @@ -879,7 +883,7 @@ } else { mysql_result=mysql_store_result(mysql); } - if (mysql_result==NULL) { + if (!mysql_result) { if (PHP_MYSQL_VALID_RESULT(mysql)) { /* query should have returned rows */ php_error(E_WARNING, "MySQL: Unable to save result set"); RETURN_FALSE;