From: Hartmut Holzgraefe Date: Wed, 12 Jul 2006 07:01:04 +0000 (+0000) Subject: fixed C&P errors in groups handling, activated groups feature X-Git-Tag: php-5.2.0RC1~125 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e796974f6feddac0e4ce57354c8d44ccd77dc0ae;p=php fixed C&P errors in groups handling, activated groups feature --- diff --git a/ext/mysqli/mysqli_embedded.c b/ext/mysqli/mysqli_embedded.c index 38d4b46c18..71f55d676f 100644 --- a/ext/mysqli/mysqli_embedded.c +++ b/ext/mysqli/mysqli_embedded.c @@ -75,14 +75,14 @@ PHP_FUNCTION(mysqli_embedded_server_start) /* 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; + groups[0] = NULL; - zend_hash_internal_pointer_reset_ex(HASH_OF(*args), &pos); + zend_hash_internal_pointer_reset_ex(HASH_OF(*grps), &pos); - for (index = 0;; zend_hash_move_forward_ex(HASH_OF(*args), &pos)) { + for (index = 0;; zend_hash_move_forward_ex(HASH_OF(*grps), &pos)) { zval ** item; - if (zend_hash_get_current_data_ex(HASH_OF(*args), (void **) &item, &pos) == FAILURE) { + if (zend_hash_get_current_data_ex(HASH_OF(*grps), (void **) &item, &pos) == FAILURE) { break; } @@ -96,7 +96,7 @@ PHP_FUNCTION(mysqli_embedded_server_start) groups[0] = NULL; } - rc = mysql_server_init(argc, arguments, NULL); + rc = mysql_server_init(argc, arguments, groups); if (argc) { efree(arguments);