diff options
| author | Anatol Belski <ab@php.net> | 2014-08-27 12:11:59 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-27 12:11:59 +0200 |
| commit | a831bd40d0c1fcfa52cc65231c06d3b9b9f77f92 (patch) | |
| tree | 9834b454dbb606bc8a1baf92cac7d79f13c581c8 | |
| parent | 37f9f10f0193c34a31f1909f20f49524b89792ab (diff) | |
| parent | 4d667eeaf39853c4c7cbae9f5eaad40c704bffe8 (diff) | |
| download | php-git-a831bd40d0c1fcfa52cc65231c06d3b9b9f77f92.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
fixed DBG_INF macro name
reworked NEWS for 5.6.0GA
| -rw-r--r-- | ext/mysqlnd/mysqlnd_net.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqlnd/mysqlnd_net.c b/ext/mysqlnd/mysqlnd_net.c index 6a243d5315..6333875e18 100644 --- a/ext/mysqlnd/mysqlnd_net.c +++ b/ext/mysqlnd/mysqlnd_net.c @@ -950,7 +950,7 @@ MYSQLND_METHOD(mysqlnd_net, enable_ssl)(MYSQLND_NET * const net TSRMLS_DC) DBG_RETURN(PASS); #else DBG_ENTER("mysqlnd_net::enable_ssl"); - DBG_INFO("MYSQLND_SSL_SUPPORTED is not defined"); + DBG_INF("MYSQLND_SSL_SUPPORTED is not defined"); DBG_RETURN(PASS); #endif } |