summaryrefslogtreecommitdiff
path: root/ext/mysqli/mysqli_fe.c
diff options
context:
space:
mode:
authorAndrey Hristov <andrey@php.net>2008-11-18 17:02:18 +0000
committerAndrey Hristov <andrey@php.net>2008-11-18 17:02:18 +0000
commit825034cea5546ba9c5542abbd863338c2ec0beaf (patch)
tree4cd04d1407bd881078d2a8b05acf49feb7a7e3cb /ext/mysqli/mysqli_fe.c
parent4126370491cc42427e96ada7883fa924f0bdef34 (diff)
downloadphp-git-825034cea5546ba9c5542abbd863338c2ec0beaf.tar.gz
MFH:
Asynchronous queries for mysqli, when mysqlnd is enabled. Includes 4 tests for mysqli_poll
Diffstat (limited to 'ext/mysqli/mysqli_fe.c')
-rw-r--r--ext/mysqli/mysqli_fe.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/ext/mysqli/mysqli_fe.c b/ext/mysqli/mysqli_fe.c
index aa5b14fcb0..c05f07a526 100644
--- a/ext/mysqli/mysqli_fe.c
+++ b/ext/mysqli/mysqli_fe.c
@@ -113,12 +113,18 @@ const zend_function_entry mysqli_functions[] = {
PHP_FE(mysqli_num_rows, NULL)
PHP_FE(mysqli_options, NULL)
PHP_FE(mysqli_ping, NULL)
+#if defined(MYSQLI_USE_MYSQLND)
+ PHP_FE(mysqli_poll, NULL)
+#endif
PHP_FE(mysqli_prepare, NULL)
PHP_FE(mysqli_report, NULL)
PHP_FE(mysqli_query, NULL)
PHP_FE(mysqli_real_connect, NULL)
PHP_FE(mysqli_real_escape_string, NULL)
PHP_FE(mysqli_real_query, NULL)
+#if defined(MYSQLI_USE_MYSQLND)
+ PHP_FE(mysqli_reap_async_query, NULL)
+#endif
PHP_FE(mysqli_rollback, NULL)
PHP_FE(mysqli_select_db, NULL)
#ifdef HAVE_MYSQLI_SET_CHARSET
@@ -219,6 +225,10 @@ const zend_function_entry mysqli_link_methods[] = {
PHP_FALIAS(query,mysqli_query,NULL)
PHP_FALIAS(real_connect,mysqli_real_connect,NULL)
PHP_FALIAS(real_escape_string,mysqli_real_escape_string,NULL)
+#if defined(MYSQLI_USE_MYSQLND)
+ PHP_FALIAS(poll,mysqli_poll,NULL)
+ PHP_FALIAS(reap_async_query,mysqli_reap_async_query,NULL)
+#endif
PHP_FALIAS(escape_string, mysqli_real_escape_string,NULL)
PHP_FALIAS(real_query,mysqli_real_query,NULL)
PHP_FALIAS(rollback,mysqli_rollback,NULL)
@@ -280,11 +290,11 @@ const zend_function_entry mysqli_stmt_methods[] = {
PHP_FALIAS(fetch,mysqli_stmt_fetch,NULL)
PHP_FALIAS(get_warnings, mysqli_stmt_get_warnings, NULL)
PHP_FALIAS(result_metadata, mysqli_stmt_result_metadata,NULL)
- PHP_FALIAS(num_rows, mysqli_stmt_num_rows,NULL)
#if defined(MYSQLI_USE_MYSQLND)
- PHP_FALIAS(more_results, mysqli_stmt_more_results, NULL)
- PHP_FALIAS(next_result, mysqli_stmt_next_result, NULL)
+ PHP_FALIAS(more_results, mysqli_stmt_more_results,NULL)
+ PHP_FALIAS(next_result, mysqli_stmt_next_result,NULL)
#endif
+ PHP_FALIAS(num_rows, mysqli_stmt_num_rows,NULL)
PHP_FALIAS(send_long_data,mysqli_stmt_send_long_data,NULL)
PHP_FALIAS(stmt,mysqli_prepare,NULL)
PHP_FALIAS(free_result,mysqli_stmt_free_result,NULL)