johannes Mon Sep 29 21:15:17 2008 UTC Modified files: /php-src/ext/mysql mysql_mysqlnd.h php_mysql.c Log: No mysqli stuff in ext/mysql http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/mysql_mysqlnd.h?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mysql/mysql_mysqlnd.h diff -u php-src/ext/mysql/mysql_mysqlnd.h:1.3 php-src/ext/mysql/mysql_mysqlnd.h:1.4 --- php-src/ext/mysql/mysql_mysqlnd.h:1.3 Mon Dec 31 07:12:11 2007 +++ php-src/ext/mysql/mysql_mysqlnd.h Mon Sep 29 21:15:16 2008 @@ -24,18 +24,7 @@ #include "ext/mysqlnd/mysqlnd_libmysql_compat.h" -/* Here comes non-libmysql API to have less ifdefs in mysqli*/ -#define MYSQLI_CLOSE_EXPLICIT MYSQLND_CLOSE_EXPLICIT -#define MYSQLI_CLOSE_IMPLICIT MYSQLND_CLOSE_IMPLICIT -#define MYSQLI_CLOSE_DISCONNECTED MYSQLND_CLOSE_DISCONNECTED - -#define mysqli_result_is_unbuffered(r) ((r)->unbuf) -#define mysqli_server_status(c) (c)->upsert_status.server_status -#define mysqli_stmt_warning_count(s) mysqlnd_stmt_warning_count((s)) -#define mysqli_stmt_server_status(s) (s)->upsert_status.server_status -#define mysqli_stmt_get_connection(s) (s)->conn -#define mysqli_close(c, how) mysqlnd_close((c), (how)) -#define mysqli_stmt_close(c, implicit) mysqlnd_stmt_close((c), (implicit)) -#define mysqli_free_result(r, implicit) mysqlnd_free_result((r), (implicit)) +/* Here comes non-libmysql API to have less ifdefs in mysql */ +#define mysql_result_is_unbuffered(r) ((r)->unbuf) #endif http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.264&r2=1.265&diff_format=u Index: php-src/ext/mysql/php_mysql.c diff -u php-src/ext/mysql/php_mysql.c:1.264 php-src/ext/mysql/php_mysql.c:1.265 --- php-src/ext/mysql/php_mysql.c:1.264 Fri Jul 25 08:53:11 2008 +++ php-src/ext/mysql/php_mysql.c Mon Sep 29 21:15:16 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.264 2008/07/25 08:53:11 dmitry Exp $ */ +/* $Id: php_mysql.c,v 1.265 2008/09/29 21:15:16 johannes Exp $ */ /* TODO: * @@ -269,7 +269,7 @@ \ 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); \ @@ -915,7 +915,7 @@ efree(hashed_details); /* free mysql structure */ #ifdef MYSQL_USE_MYSQLND - mysqli_close(mysql->conn, MYSQLI_CLOSE_DISCONNECTED); + mysqlnd_close(mysql->conn, MYSQLND_CLOSE_DISCONNECTED); #endif efree(mysql); MYSQL_DO_CONNECT_RETURN_FALSE();
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php