diff options
| author | Xinchen Hui <laruence@php.net> | 2014-05-20 15:50:41 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-05-20 15:50:41 +0800 |
| commit | f2028491aa44367dbf77cc1008e9e4b027f60666 (patch) | |
| tree | 8377e27cb7145df823751ead056f8857f140f870 /ext/mysqlnd/mysqlnd_debug.c | |
| parent | e1317ed5176d9c467d885c3149fa668822172cb1 (diff) | |
| parent | 4d299b5092ac18e158073ac92ad606fd4858b05c (diff) | |
| download | php-git-f2028491aa44367dbf77cc1008e9e4b027f60666.tar.gz | |
Merge branch 'phpng' of https://git.php.net/repository/php-src into phpng
Conflicts:
ext/pdo_pgsql/tests/common.phpt
Diffstat (limited to 'ext/mysqlnd/mysqlnd_debug.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_debug.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ext/mysqlnd/mysqlnd_debug.c b/ext/mysqlnd/mysqlnd_debug.c index 9fbcc4768f..296a31dfb0 100644 --- a/ext/mysqlnd/mysqlnd_debug.c +++ b/ext/mysqlnd/mysqlnd_debug.c @@ -792,7 +792,6 @@ static struct st_mysqlnd_plugin_trace_log mysqlnd_plugin_trace_log_plugin = }, {/* methods */ mysqlnd_debug_init, - mysqlnd_get_backtrace } }; |