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_result.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_result.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_result.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c index 0112a1394d..68eabf7368 100644 --- a/ext/mysqlnd/mysqlnd_result.c +++ b/ext/mysqlnd/mysqlnd_result.c @@ -630,8 +630,6 @@ mysqlnd_query_read_result_set_header(MYSQLND_CONN_DATA * conn, MYSQLND_STMT * s stmt->state = MYSQLND_STMT_INITTED; } } else { - unsigned int to_log = MYSQLND_G(log_mask); - to_log &= fields_eof->server_status; DBG_INF_FMT("warnings=%u server_status=%u", fields_eof->warning_count, fields_eof->server_status); conn->upsert_status->warning_count = fields_eof->warning_count; /* @@ -649,13 +647,6 @@ mysqlnd_query_read_result_set_header(MYSQLND_CONN_DATA * conn, MYSQLND_STMT * s } else if (fields_eof->server_status & SERVER_QUERY_WAS_SLOW) { statistic = STAT_QUERY_WAS_SLOW; } - if (to_log) { -#if A0 - char *backtrace = mysqlnd_get_backtrace(TSRMLS_C); - php_log_err(backtrace TSRMLS_CC); - efree(backtrace); -#endif - } MYSQLND_INC_CONN_STATISTIC(conn->stats, statistic); } } while (0); |