diff options
author | Anatol Belski <ab@php.net> | 2014-08-27 12:11:35 +0200 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2014-08-27 12:11:35 +0200 |
commit | 4d667eeaf39853c4c7cbae9f5eaad40c704bffe8 (patch) | |
tree | e6067929a106663b269f035b2d7306dc7641294e | |
parent | 1d6e9e8fb7b2340f775798b334f9bc0fa2c526f0 (diff) | |
parent | 7fac56e0729385bbd2bb040f06a20a697d9de5fd (diff) | |
download | php-git-4d667eeaf39853c4c7cbae9f5eaad40c704bffe8.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fixed DBG_INF macro name
-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 a0beed8b97..d55fb85b66 100644 --- a/ext/mysqlnd/mysqlnd_net.c +++ b/ext/mysqlnd/mysqlnd_net.c @@ -934,7 +934,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 } |