diff options
| author | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
| commit | b3823f5cab4e405b767cd8dddebb54b1c29bd2a8 (patch) | |
| tree | e42fbf615d62213c1e744b8a909155e8f2cdaa87 /ext/mysqlnd/php_mysqlnd.c | |
| parent | e6fb493e5dbafdad37ba5334c986636342b5d9aa (diff) | |
| parent | 31817447cc06093368f022086340ad3f6f616528 (diff) | |
| download | php-git-b3823f5cab4e405b767cd8dddebb54b1c29bd2a8.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/json.c
ext/json/utf8_decode.c
Diffstat (limited to 'ext/mysqlnd/php_mysqlnd.c')
| -rw-r--r-- | ext/mysqlnd/php_mysqlnd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/mysqlnd/php_mysqlnd.c b/ext/mysqlnd/php_mysqlnd.c index 92128d7715..db15771ff6 100644 --- a/ext/mysqlnd/php_mysqlnd.c +++ b/ext/mysqlnd/php_mysqlnd.c @@ -64,7 +64,7 @@ mysqlnd_minfo_dump_plugin_stats(zval *el, void * argument) zval values; snprintf(buf, sizeof(buf), "%s statistics", plugin_header->plugin_name); - mysqlnd_fill_stats_hash(plugin_header->plugin_stats.values, plugin_header->plugin_stats.names, &values ZEND_FILE_LINE_CC); + mysqlnd_fill_stats_hash(plugin_header->plugin_stats.values, plugin_header->plugin_stats.names, &values ZEND_FILE_LINE_CC); php_info_print_table_start(); php_info_print_table_header(2, buf, ""); @@ -78,7 +78,7 @@ mysqlnd_minfo_dump_plugin_stats(zval *el, void * argument) /* {{{ mysqlnd_minfo_dump_loaded_plugins */ -static int +static int mysqlnd_minfo_dump_loaded_plugins(zval *el, void * buf) { smart_str * buffer = (smart_str *) buf; |