Import of mysqlnd and ext/mysql + ext/mysqli patched to be built either

with libmysql or mysqld.

Use --with-mysql=mysqlnd --with-mysqli=mysqlnd to build with mysqlnd.

1 files changed, 51 insertions, 20 deletions

diff --git a/ext/mysqli/mysqli_fe.c b/ext/mysqli/mysqli_fe.c
index cb8b78fd03..965379a704 100644
--- a/ext/mysqli/mysqli_fe.c
+++ b/ext/mysqli/mysqli_fe.c
@@ -1,6 +1,6 @@
 /*
   +----------------------------------------------------------------------+
-  | PHP Version 5                                                        |
+  | PHP Version 6                                                        |
   +----------------------------------------------------------------------+
   | Copyright (c) 1997-2007 The PHP Group                                |
   +----------------------------------------------------------------------+
@@ -12,7 +12,9 @@
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-  | Author: Georg Richter <georg@php.net>                                |
+  | Authors: Georg Richter <georg@php.net>                               |
+  |          Andrey Hristov <andrey@php.net>                             |
+  |          Ulf Wendel <uw@php.net>                                     |
   +----------------------------------------------------------------------+
 
   $Id$ 
@@ -27,7 +29,7 @@
 #include "php.h"
 #include "php_ini.h"
 #include "ext/standard/info.h"
-#include "php_mysqli.h"
+#include "php_mysqli_structs.h"
 
 
 static
@@ -61,14 +63,24 @@ zend_function_entry mysqli_functions[] = {
 	PHP_FE(mysqli_connect_errno,						NULL)
 	PHP_FE(mysqli_connect_error,						NULL)
 	PHP_FE(mysqli_data_seek,							NULL)
+	PHP_FE(mysqli_dump_debug_info,						NULL)
 	PHP_FE(mysqli_debug,								NULL)
+#if !defined(HAVE_MYSQLND)
 	PHP_FE(mysqli_disable_reads_from_master,			NULL)
 	PHP_FE(mysqli_disable_rpl_parse,					NULL)
-	PHP_FE(mysqli_dump_debug_info,						NULL)
 	PHP_FE(mysqli_enable_reads_from_master,				NULL)
 	PHP_FE(mysqli_enable_rpl_parse,						NULL)
+	PHP_FE(mysqli_send_query,							NULL)
+	PHP_FE(mysqli_slave_query,							NULL)
+	PHP_FE(mysqli_master_query,							NULL)
+	PHP_FE(mysqli_rpl_parse_enabled,					NULL)
+	PHP_FE(mysqli_rpl_probe,							NULL)
+	PHP_FE(mysqli_rpl_query_type,						NULL)
+#endif
+#if defined(HAVE_EMBEDDED_MYSQLI)
 	PHP_FE(mysqli_embedded_server_end,					NULL)
 	PHP_FE(mysqli_embedded_server_start,				NULL)
+#endif
 	PHP_FE(mysqli_errno,								NULL)
 	PHP_FE(mysqli_error,								NULL)
 	PHP_FE(mysqli_stmt_execute,							NULL)
@@ -77,14 +89,22 @@ zend_function_entry mysqli_functions[] = {
 	PHP_FE(mysqli_fetch_fields,							NULL)
 	PHP_FE(mysqli_fetch_field_direct,					NULL)
 	PHP_FE(mysqli_fetch_lengths,						NULL)
+#ifdef HAVE_MYSQLND
+	PHP_FE(mysqli_fetch_all,							NULL)
+#endif
 	PHP_FE(mysqli_fetch_array,							NULL)
 	PHP_FE(mysqli_fetch_assoc,							NULL) 
-	PHP_FE(mysqli_fetch_object,							NULL) 
+	PHP_FE(mysqli_fetch_object,							NULL)
 	PHP_FE(mysqli_fetch_row,							NULL)
 	PHP_FE(mysqli_field_count,							NULL)
 	PHP_FE(mysqli_field_seek,							NULL)
 	PHP_FE(mysqli_field_tell,							NULL)
 	PHP_FE(mysqli_free_result,							NULL)
+#if defined(HAVE_MYSQLND)
+	PHP_FE(mysqli_get_cache_stats,						NULL)
+	PHP_FE(mysqli_get_connection_stats,					NULL)
+	PHP_FE(mysqli_get_client_stats,						NULL)
+#endif
 #ifdef HAVE_MYSQLI_GET_CHARSET 
 	PHP_FE(mysqli_get_charset,							NULL)
 #endif
@@ -101,7 +121,6 @@ zend_function_entry mysqli_functions[] = {
 	PHP_FE(mysqli_kill,									NULL)
 	PHP_FE(mysqli_set_local_infile_default,				NULL)
 	PHP_FE(mysqli_set_local_infile_handler,				NULL)
-	PHP_FE(mysqli_master_query,							NULL)
 	PHP_FE(mysqli_more_results,							NULL)
 	PHP_FE(mysqli_multi_query, 							NULL)
 	PHP_FE(mysqli_next_result,							NULL)
@@ -116,9 +135,6 @@ zend_function_entry mysqli_functions[] = {
 	PHP_FE(mysqli_real_escape_string,					NULL)
 	PHP_FE(mysqli_real_query,							NULL)
 	PHP_FE(mysqli_rollback,								NULL)
-	PHP_FE(mysqli_rpl_parse_enabled,					NULL)
-	PHP_FE(mysqli_rpl_probe,							NULL)
-	PHP_FE(mysqli_rpl_query_type,						NULL)
 	PHP_FE(mysqli_select_db,							NULL)
 #ifdef HAVE_MYSQLI_SET_CHARSET
 	PHP_FE(mysqli_set_charset,							NULL)
@@ -134,14 +150,17 @@ zend_function_entry mysqli_functions[] = {
 	PHP_FE(mysqli_stmt_bind_result,						second_arg_force_by_ref_rest)
 	PHP_FE(mysqli_stmt_fetch,							NULL)
 	PHP_FE(mysqli_stmt_free_result,						NULL)
+#if defined(HAVE_MYSQLND)
+	PHP_FE(mysqli_stmt_get_result,						NULL)
+#endif
 	PHP_FE(mysqli_stmt_get_warnings,					NULL)
 	PHP_FE(mysqli_stmt_insert_id,						NULL)
 	PHP_FE(mysqli_stmt_reset,							NULL)
 	PHP_FE(mysqli_stmt_param_count,						NULL)
-	PHP_FE(mysqli_send_query,							NULL)
-	PHP_FE(mysqli_slave_query,							NULL)
 	PHP_FE(mysqli_sqlstate,   							NULL)
+#if !defined(HAVE_MYSQLND)
 	PHP_FE(mysqli_ssl_set,								NULL)
+#endif
 	PHP_FE(mysqli_stat,									NULL)
 	PHP_FE(mysqli_stmt_affected_rows,					NULL)
 	PHP_FE(mysqli_stmt_close,							NULL)
@@ -150,8 +169,8 @@ zend_function_entry mysqli_functions[] = {
 	PHP_FE(mysqli_stmt_error,							NULL)
 	PHP_FE(mysqli_stmt_num_rows,						NULL)
 	PHP_FE(mysqli_stmt_sqlstate,   						NULL)
-	PHP_FE(mysqli_store_result,							NULL)
 	PHP_FE(mysqli_stmt_store_result,					NULL)
+	PHP_FE(mysqli_store_result,							NULL)
 	PHP_FE(mysqli_thread_id,							NULL)
 	PHP_FE(mysqli_thread_safe,							NULL)
 	PHP_FE(mysqli_use_result,							NULL)
@@ -184,23 +203,32 @@ zend_function_entry mysqli_link_methods[] = {
 	PHP_FALIAS(close,mysqli_close,NULL)
 	PHP_FALIAS(commit,mysqli_commit,NULL)
 	PHP_FALIAS(connect,mysqli_connect,NULL)
+	PHP_FALIAS(dump_debug_info,mysqli_dump_debug_info,NULL)
 	PHP_FALIAS(debug,mysqli_debug,NULL)
+#if !defined(HAVE_MYSQLND)
 	PHP_FALIAS(disable_reads_from_master,mysqli_disable_reads_from_master,NULL)
 	PHP_FALIAS(disable_rpl_parse,mysqli_disable_rpl_parse,NULL)
-	PHP_FALIAS(dump_debug_info,mysqli_dump_debug_info,NULL)
 	PHP_FALIAS(enable_reads_from_master,mysqli_enable_reads_from_master,NULL)
 	PHP_FALIAS(enable_rpl_parse,mysqli_enable_rpl_parse,NULL)
+	PHP_FALIAS(rpl_parse_enabled,mysqli_rpl_parse_enabled,NULL)
+	PHP_FALIAS(rpl_probe,mysqli_rpl_probe,NULL)
+	PHP_FALIAS(rpl_query_type,mysqli_rpl_query_type,NULL)
+	PHP_FALIAS(master_query,mysqli_master_query,NULL)
+	PHP_FALIAS(slave_query,mysqli_slave_query,NULL)
+#endif
 #ifdef HAVE_MYSQLI_GET_CHARSET 
 	PHP_FALIAS(get_charset,mysqli_get_charset,NULL)
 #endif
 	PHP_FALIAS(get_client_info,mysqli_get_client_info,NULL)
+#if defined(HAVE_MYSQLND)
+	PHP_FALIAS(get_connection_stats,mysqli_get_connection_stats,NULL)
+#endif
 	PHP_FALIAS(get_server_info,mysqli_get_server_info,NULL)
 	PHP_FALIAS(get_warnings, mysqli_get_warnings, NULL)
 	PHP_FALIAS(init,mysqli_init,NULL)
 	PHP_FALIAS(kill,mysqli_kill,NULL)
 	PHP_FALIAS(set_local_infile_default,mysqli_set_local_infile_default,NULL)
 	PHP_FALIAS(set_local_infile_handler,mysqli_set_local_infile_handler,NULL)
-	PHP_FALIAS(master_query,mysqli_master_query,NULL)
 	PHP_FALIAS(multi_query,mysqli_multi_query,NULL)
 	PHP_FALIAS(mysqli,mysqli_connect,NULL)
 	PHP_FALIAS(more_results,mysqli_more_results, NULL)
@@ -214,16 +242,14 @@ zend_function_entry mysqli_link_methods[] = {
 	PHP_FALIAS(escape_string, mysqli_real_escape_string,NULL)
 	PHP_FALIAS(real_query,mysqli_real_query,NULL)
 	PHP_FALIAS(rollback,mysqli_rollback,NULL)
-	PHP_FALIAS(rpl_parse_enabled,mysqli_rpl_parse_enabled,NULL)
-	PHP_FALIAS(rpl_probe,mysqli_rpl_probe,NULL)
-	PHP_FALIAS(rpl_query_type,mysqli_rpl_query_type,NULL)
 	PHP_FALIAS(select_db,mysqli_select_db,NULL)
 #ifdef HAVE_MYSQLI_SET_CHARSET
 	PHP_FALIAS(set_charset,mysqli_set_charset,NULL)
 #endif
 	PHP_FALIAS(set_opt, mysqli_options,NULL)
-	PHP_FALIAS(slave_query,mysqli_slave_query,NULL)
+#if !defined(HAVE_MYSQLND)
 	PHP_FALIAS(ssl_set,mysqli_ssl_set,NULL)
+#endif
 	PHP_FALIAS(stat,mysqli_stat,NULL)
 	PHP_FALIAS(stmt_init,mysqli_stmt_init, NULL)
 	PHP_FALIAS(store_result,mysqli_store_result,NULL)
@@ -245,11 +271,13 @@ zend_function_entry mysqli_result_methods[] = {
 	PHP_FALIAS(fetch_field,mysqli_fetch_field,NULL)
 	PHP_FALIAS(fetch_fields,mysqli_fetch_fields,NULL)
 	PHP_FALIAS(fetch_field_direct,mysqli_fetch_field_direct,NULL)
+#if defined(HAVE_MYSQLND)
+	PHP_FALIAS(fetch_all,mysqli_fetch_all,NULL)
+#endif
 	PHP_FALIAS(fetch_array,mysqli_fetch_array,NULL)
 	PHP_FALIAS(fetch_assoc,mysqli_fetch_assoc,NULL) 
 	PHP_FALIAS(fetch_object,mysqli_fetch_object,NULL) 
 	PHP_FALIAS(fetch_row,mysqli_fetch_row,NULL)
-	PHP_FALIAS(field_count,mysqli_field_count,NULL)
 	PHP_FALIAS(field_seek,mysqli_field_seek,NULL)
 	PHP_FALIAS(free_result,mysqli_free_result,NULL)
 	{NULL, NULL, NULL}
@@ -261,7 +289,7 @@ zend_function_entry mysqli_result_methods[] = {
  * Every user visible function must have an entry in mysqli_stmt_functions[].
  */
 zend_function_entry mysqli_stmt_methods[] = {
-	PHP_FALIAS(__construct,mysqli_stmt_construct,NULL)
+	PHP_FALIAS(__construct, mysqli_stmt_construct, NULL)
 	PHP_FALIAS(attr_get,mysqli_stmt_attr_get,NULL)
 	PHP_FALIAS(attr_set,mysqli_stmt_attr_set,NULL)
 	PHP_FALIAS(bind_param,mysqli_stmt_bind_param,second_arg_force_by_ref_rest)
@@ -279,6 +307,9 @@ zend_function_entry mysqli_stmt_methods[] = {
 	PHP_FALIAS(reset,mysqli_stmt_reset,NULL)
 	PHP_FALIAS(prepare,mysqli_stmt_prepare, NULL)
 	PHP_FALIAS(store_result,mysqli_stmt_store_result,NULL)
+#if defined(HAVE_MYSQLND)
+	PHP_FALIAS(get_result,mysqli_stmt_get_result,NULL)
+#endif
 	{NULL, NULL, NULL}
 };
 /* }}} */