diff options
| author | kusano <kusano@users.noreply.github.com> | 2016-02-17 01:00:58 +0900 |
|---|---|---|
| committer | kusano <kusano@users.noreply.github.com> | 2016-02-17 01:00:58 +0900 |
| commit | 07cae46b02795f8364d28ecad6ec45f507e7114b (patch) | |
| tree | 47795fa54a8cf014e918d8bfe3056e9b30ec9b0e /ext/mysqlnd/mysqlnd_statistics.c | |
| parent | d31e8a9a85efea54db0b647424f6c4485d71db8b (diff) | |
| parent | 3244d3c7e936b23ad33892e367500f64468c6140 (diff) | |
| download | php-git-07cae46b02795f8364d28ecad6ec45f507e7114b.tar.gz | |
Merge branch 'master' into fix-mt_rand
Conflicts:
ext/standard/rand.c
Diffstat (limited to 'ext/mysqlnd/mysqlnd_statistics.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_statistics.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/mysqlnd/mysqlnd_statistics.c b/ext/mysqlnd/mysqlnd_statistics.c index 247e627ef2..b1d37949a9 100644 --- a/ext/mysqlnd/mysqlnd_statistics.c +++ b/ext/mysqlnd/mysqlnd_statistics.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 2006-2015 The PHP Group | + | Copyright (c) 2006-2016 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -109,8 +109,10 @@ const MYSQLND_STRING mysqlnd_stats_values_names[STAT_LAST] = { MYSQLND_STR_W_LEN("mem_free_amount") }, { MYSQLND_STR_W_LEN("mem_estrndup_count") }, { MYSQLND_STR_W_LEN("mem_strndup_count") }, - { MYSQLND_STR_W_LEN("mem_estndup_count") }, + { MYSQLND_STR_W_LEN("mem_estrdup_count") }, { MYSQLND_STR_W_LEN("mem_strdup_count") }, + { MYSQLND_STR_W_LEN("mem_edupl_count") }, + { MYSQLND_STR_W_LEN("mem_dupl_count") }, { MYSQLND_STR_W_LEN("proto_text_fetched_null") }, { MYSQLND_STR_W_LEN("proto_text_fetched_bit") }, { MYSQLND_STR_W_LEN("proto_text_fetched_tinyint") }, |