summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>2000-11-08 08:27:27 +0000
committerZeev Suraski <zeev@php.net>2000-11-08 08:27:27 +0000
commit905e41af5ce7d96ba058ad280e08879a8ed8c426 (patch)
tree89f42ae238d21b71f3d8142cfb7cb83481106b72 /ext
parent1afebc69c7e4cf792afd4e394d0c3c48009ef8e5 (diff)
downloadphp-git-905e41af5ce7d96ba058ad280e08879a8ed8c426.tar.gz
Will work on a more thorough implementation for mysql_store_result() after 4.0.4
Diffstat (limited to 'ext')
-rw-r--r--ext/mysql/php_mysql.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index 22ffb0f70a..e198931909 100644
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -771,6 +771,7 @@ PHP_FUNCTION(mysql_query)
}
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 @@ PHP_FUNCTION(mysql_query)
}
id = -1;
break;
+#endif
default:
WRONG_PARAM_COUNT;
break;
@@ -804,7 +806,7 @@ PHP_FUNCTION(mysql_query)
} 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 @@ PHP_FUNCTION(mysql_db_query)
}
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 @@ PHP_FUNCTION(mysql_db_query)
}
id = -1;
break;
+#endif
default:
WRONG_PARAM_COUNT;
break;
@@ -879,7 +883,7 @@ PHP_FUNCTION(mysql_db_query)
} 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;