com php-src: after merge fix: ext/mysqli/mysqli_nonapi.c
| From: | Anatol Belski | Date: | Wed, 29 Jan 2014 22:21:15 +0000 |
| Subject: | com php-src: after merge fix: ext/mysqli/mysqli_nonapi.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75854@lists.php.net to get a copy of this message | ||
Commit: 0c1456958402773f1ec5d2c64430143c0e0303a1
Author: Anatol Belski <ab@php.net> Wed, 29 Jan 2014 23:21:15 +0100
Parents: 27868a096688e980106e2b6aeb20ad35cbbee4ec
Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0c1456958402773f1ec5d2c64430143c0e0303a1
Log:
after merge fix
Changed paths:
M ext/mysqli/mysqli_nonapi.c
Diff:
diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c
index 68c7775..78b22e2 100644
--- a/ext/mysqli/mysqli_nonapi.c
+++ b/ext/mysqli/mysqli_nonapi.c
@@ -1220,9 +1220,9 @@ PHP_FUNCTION(mysqli_get_links_stats)
return;
}
array_init(return_value);
- add_assoc_long_ex(return_value, "total", sizeof("total"), MyG(num_links));
- add_assoc_long_ex(return_value, "active_plinks", sizeof("active_plinks"),
MyG(num_active_persistent));
- add_assoc_long_ex(return_value, "cached_plinks", sizeof("cached_plinks"),
MyG(num_inactive_persistent));
+ add_assoc_int_ex(return_value, "total", sizeof("total"), MyG(num_links));
+ add_assoc_int_ex(return_value, "active_plinks", sizeof("active_plinks"),
MyG(num_active_persistent));
+ add_assoc_int_ex(return_value, "cached_plinks", sizeof("cached_plinks"),
MyG(num_inactive_persistent));
}
/* }}} */