andrey Fri May 29 13:09:47 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqli config.m4 mysqli_api.c mysqli_mysqlnd.h
/php-src/ext/mysqlnd mysqlnd_libmysql_compat.h
Log:
MFH:Add support for mysql_stmt_store_result() from libmysql 6.0.8+ and 5.4.x
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/config.m4?r1=1.22.2.1.2.2.2.4&r2=1.22.2.1.2.2.2.5&diff_format=u
Index: php-src/ext/mysqli/config.m4
diff -u php-src/ext/mysqli/config.m4:1.22.2.1.2.2.2.4
php-src/ext/mysqli/config.m4:1.22.2.1.2.2.2.5
--- php-src/ext/mysqli/config.m4:1.22.2.1.2.2.2.4 Mon Mar 10 20:15:38 2008
+++ php-src/ext/mysqli/config.m4 Fri May 29 13:09:46 2009
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.22.2.1.2.2.2.4 2008/03/10 20:15:38 andrey Exp $
+dnl $Id: config.m4,v 1.22.2.1.2.2.2.5 2009/05/29 13:09:46 andrey Exp $
dnl config.m4 for extension mysqli
PHP_ARG_WITH(mysqli, for MySQLi support,
@@ -61,6 +61,16 @@
],[
$MYSQLI_LIBLINE
])
+ dnl
+ dnl Check the library for mysql_stmt_store_result
+ dnl
+ PHP_CHECK_LIBRARY($MYSQL_LIB_NAME, mysql_stmt_next_result,
+ [
+ AC_DEFINE(HAVE_STMT_NEXT_RESULT, 1, [ ])
+ ],[
+ ],[
+ $MYSQLI_LIBLINE
+ ])
fi
dnl Build extension
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.22.2.16.2.27&r2=1.118.2.22.2.16.2.28&diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.27
php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.28
--- php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.27 Sat May 23
02:58:15 2009
+++ php-src/ext/mysqli/mysqli_api.c Fri May 29 13:09:46 2009
@@ -17,7 +17,7 @@
| Ulf Wendel <[email protected]> |
+----------------------------------------------------------------------+
- $Id: mysqli_api.c,v 1.118.2.22.2.16.2.27 2009/05/23 02:58:15 kalle Exp $
+ $Id: mysqli_api.c,v 1.118.2.22.2.16.2.28 2009/05/29 13:09:46 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1484,7 +1484,7 @@
/* }}} */
-#ifdef MYSQLI_USE_MYSQLND
+#ifdef HAVE_STMT_NEXT_RESULT
/* {{{ proto bool mysqli_stmt_next_result(object link)
check if there any more query results from a multi query */
PHP_FUNCTION(mysqli_stmt_more_results)
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_mysqlnd.h?r1=1.3.2.6&r2=1.3.2.7&diff_format=u
Index: php-src/ext/mysqli/mysqli_mysqlnd.h
diff -u php-src/ext/mysqli/mysqli_mysqlnd.h:1.3.2.6
php-src/ext/mysqli/mysqli_mysqlnd.h:1.3.2.7
--- php-src/ext/mysqli/mysqli_mysqlnd.h:1.3.2.6 Wed Dec 31 11:15:39 2008
+++ php-src/ext/mysqli/mysqli_mysqlnd.h Fri May 29 13:09:47 2009
@@ -40,4 +40,6 @@
#define mysqli_bg_store_result(r) mysqlnd_bg_store_result((r))
#define mysqli_async_query(c, q, l) mysqlnd_async_query((c), (q),
(l))
+#define HAVE_STMT_NEXT_RESULT
+
#endif
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_libmysql_compat.h?r1=1.1.2.11&r2=1.1.2.12&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_libmysql_compat.h
diff -u php-src/ext/mysqlnd/mysqlnd_libmysql_compat.h:1.1.2.11
php-src/ext/mysqlnd/mysqlnd_libmysql_compat.h:1.1.2.12
--- php-src/ext/mysqlnd/mysqlnd_libmysql_compat.h:1.1.2.11 Thu Jan 22
21:01:54 2009
+++ php-src/ext/mysqlnd/mysqlnd_libmysql_compat.h Fri May 29 13:09:47 2009
@@ -101,6 +101,8 @@
#define mysql_stmt_attr_set(s,a,v) mysqlnd_stmt_attr_set((s), (a),
(v))
#define mysql_stmt_param_metadata(s) mysqlnd_stmt_param_metadata((s))
#define mysql_stmt_result_metadata(s) mysqlnd_stmt_result_metadata((s))
+#define mysql_stmt_next_result(s) mysqlnd_stmt_next_result((s))
+#define mysql_stmt_more_results(s) mysqlnd_stmt_more_results((s))
#define mysql_thread_safe() mysqlnd_thread_safe()
#define mysql_info(r) mysqlnd_info((r))
#define mysql_options(r,a,b) mysqlnd_options((r), (a), (b))
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
