johannes Mon Sep 29 21:18:31 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysql mysql_mysqlnd.h php_mysql.c
Log:
MFH: No mysqli stuff in ext/mysql
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/mysql_mysqlnd.h?r1=1.2.2.3&r2=1.2.2.4&diff_format=u
Index: php-src/ext/mysql/mysql_mysqlnd.h
diff -u php-src/ext/mysql/mysql_mysqlnd.h:1.2.2.3
php-src/ext/mysql/mysql_mysqlnd.h:1.2.2.4
--- php-src/ext/mysql/mysql_mysqlnd.h:1.2.2.3 Mon Dec 31 07:17:10 2007
+++ php-src/ext/mysql/mysql_mysqlnd.h Mon Sep 29 21:18:31 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 mysqli */
+#define mysql_result_is_unbuffered(r) ((r)->unbuf)
#endif
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.26&r2=1.213.2.6.2.16.2.27&diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.26
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.27
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.26 Wed Aug 6 19:25:03 2008
+++ php-src/ext/mysql/php_mysql.c Mon Sep 29 21:18:31 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.26 2008/08/06 19:25:03 andrey Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.27 2008/09/29 21:18:31 johannes Exp $ */
/* TODO:
*
@@ -274,7 +274,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);
\
@@ -888,7 +888,7 @@
#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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
