Added new classes:

	mysqli_driver
	mysqli_warning
	mysqli_exception
	mysqli_sql_exception

Improved embedded server support
changed testsuite to work also with embedded server

Made statement and resultset classes extendable

minor fixes

1 files changed, 124 insertions, 0 deletions

diff --git a/ext/mysqli/mysqli_embedded.c b/ext/mysqli/mysqli_embedded.c
new file mode 100644
index 0000000000..9990bd9b5f
--- /dev/null
+++ b/ext/mysqli/mysqli_embedded.c
@@ -0,0 +1,124 @@
+/*
+  +----------------------------------------------------------------------+
+  | PHP Version 5                                                        |
+  +----------------------------------------------------------------------+
+  | Copyright (c) 1997-2004 The PHP Group                                |
+  +----------------------------------------------------------------------+
+  | This source file is subject to version 3.0 of the PHP license,       |
+  | that is bundled with this package in the file LICENSE, and is        |
+  | available through the world-wide-web at the following url:           |
+  | http://www.php.net/license/3_0.txt.                                  |
+  | If you did not receive a copy of the PHP license and are unable to   |
+  | 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>                                |
+  +----------------------------------------------------------------------+
+
+*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <signal.h>
+
+#include "php.h"
+#include "php_ini.h"
+#include "ext/standard/info.h"
+#include "php_mysqli.h"
+
+/* {{{ proto bool mysqli_embedded_server_start(bool start, array arguments, array groups)
+   initialize and start embedded server */
+PHP_FUNCTION(mysqli_embedded_server_start)
+{
+	int	argc = 0;
+	char **arguments;
+	char **groups;
+	zval **args, **grps, **start;
+	HashPosition pos;
+	int index, rc;
+
+	if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &start, &args, &grps) == FAILURE) {
+		ZEND_WRONG_PARAM_COUNT();
+	}
+
+	convert_to_long_ex(start);
+	convert_to_array_ex(args);
+	convert_to_array_ex(grps);
+
+	if (!Z_LVAL_PP(start)) {
+		mysql_server_init(-1,NULL, NULL);
+		RETURN_TRUE;
+	}
+
+	if (MyG(embedded)) {
+		/* get arguments */
+		if ((argc = zend_hash_num_elements(HASH_OF(*args)))) {
+			arguments = safe_emalloc(sizeof(char *), argc + 1, 0);
+			arguments[0] = NULL; 
+	
+			zend_hash_internal_pointer_reset_ex(HASH_OF(*args), &pos);
+
+			for (index = 0;; zend_hash_move_forward_ex(HASH_OF(*args), &pos))	{
+				zval **item;
+
+				if (zend_hash_get_current_data_ex(HASH_OF(*args), (void **) &item, &pos) == FAILURE) {
+					break;
+				}
+
+				convert_to_string_ex(item);
+	
+				arguments[++index] = Z_STRVAL_PP(item);
+			}
+			argc++;
+		}
+
+		/* get groups */
+		if ((zend_hash_num_elements(HASH_OF(*grps)))) {
+			groups = safe_emalloc(sizeof(char *), zend_hash_num_elements(HASH_OF(*grps)) + 1, 0);
+			arguments[0] = NULL; 
+
+			zend_hash_internal_pointer_reset_ex(HASH_OF(*args), &pos);
+
+			for (index = 0;; zend_hash_move_forward_ex(HASH_OF(*args), &pos))	{
+				zval ** item;
+	
+				if (zend_hash_get_current_data_ex(HASH_OF(*args), (void **) &item, &pos) == FAILURE) {
+					break;
+				}
+
+				convert_to_string_ex(item);
+
+				groups[++index] = Z_STRVAL_PP(item);
+			}
+			groups[index] = NULL;	
+		} else {
+			groups = safe_emalloc(sizeof(char *), 1, 0);
+			groups[0] = NULL;
+		}
+
+		rc = mysql_server_init(argc, arguments, NULL);
+
+		if (argc) {
+			efree(arguments);
+		}
+		efree(groups);
+
+		if (rc) {
+			RETURN_FALSE;
+		}
+		RETURN_TRUE;
+	}
+
+ 	php_error_docref(NULL TSRMLS_CC, E_ERROR, 
+					"Can't start embedded server. PHP wasn't configured with mysql embedded server support");
+}
+/* }}} */
+
+/* {{{ proto void mysqli_embedded_server_end(void)
+*/
+PHP_FUNCTION(mysqli_embedded_server_end)
+{
+	mysql_server_end();
+}
+/* }}} */