summaryrefslogtreecommitdiff
path: root/ext/mysql/php_mysql.c
diff options
context:
space:
mode:
authorJohannes Schlüter <johannes@php.net>2008-09-29 21:18:31 +0000
committerJohannes Schlüter <johannes@php.net>2008-09-29 21:18:31 +0000
commit3540da5344044fea4ca077ca33e7826aa030ab87 (patch)
treed5099e911cb11d7607ea9b2da450f443ba388d56 /ext/mysql/php_mysql.c
parent612beefba80c1ae3dd3cd07e01185f9d2fa9acbb (diff)
downloadphp-git-3540da5344044fea4ca077ca33e7826aa030ab87.tar.gz
MFH: No mysqli stuff in ext/mysql
Diffstat (limited to 'ext/mysql/php_mysql.c')
-rw-r--r--ext/mysql/php_mysql.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index abc06503f7..c4c99f03ce 100644
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -274,7 +274,7 @@ void timeout(int sig);
\
mysql_result = (MYSQL_RES *) zend_list_find(mysql->active_result_id, &type); \
if (mysql_result && type==le_result) { \
- if (mysqli_result_is_unbuffered(mysql_result) && !mysql_eof(mysql_result)) { \
+ if (mysql_result_is_unbuffered(mysql_result) && !mysql_eof(mysql_result)) { \
php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Function called without first fetching all rows from a previous unbuffered query"); \
} \
zend_list_delete(mysql->active_result_id); \
@@ -888,7 +888,7 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
#endif
/* free mysql structure */
#ifdef MYSQL_USE_MYSQLND
- mysqli_close(mysql->conn, MYSQLI_CLOSE_DISCONNECTED);
+ mysqlnd_close(mysql->conn, MYSQLND_CLOSE_DISCONNECTED);
#endif
efree(hashed_details);
efree(mysql);