[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mysqli mysqli_embedded.c

[Hartmut Holzgraefe]

hholzgra                Wed Jul 12 07:01:04 2006 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/mysqli mysqli_embedded.c 
  Log:
  fixed C&P errors in groups handling, activated groups feature
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_embedded.c?r1=1.4.2.1&r2=1.4.2.1.2.1&diff_format=u
Index: php-src/ext/mysqli/mysqli_embedded.c
diff -u php-src/ext/mysqli/mysqli_embedded.c:1.4.2.1 
php-src/ext/mysqli/mysqli_embedded.c:1.4.2.1.2.1
--- php-src/ext/mysqli/mysqli_embedded.c:1.4.2.1        Sun Jan  1 12:50:09 2006
+++ php-src/ext/mysqli/mysqli_embedded.c        Wed Jul 12 07:01:04 2006
@@ -75,14 +75,14 @@
        /* 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 @@
                groups[0] = NULL;
        }
 
-       rc = mysql_server_init(argc, arguments, NULL);
+       rc = mysql_server_init(argc, arguments, groups);
 
        if (argc) {
                efree(arguments);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php