svn: /php/php-src/ branches/PHP_5_4/ext/mysqli/mysqli.c trunk/ext/mysqli/mysqli.c

stas Tue, 06 Sep 2011 05:20:05 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=316204 Log: use DBUG_ON flag for checking debug # Some libmysql builds don't define DBUG_OFF and non-debug builds are more frequent Changed paths: U php/php-src/branches/PHP_5_4/ext/mysqli/mysqli.c U php/php-src/trunk/ext/mysqli/mysqli.c Modified: php/php-src/branches/PHP_5_4/ext/mysqli/mysqli.c =================================================================== --- php/php-src/branches/PHP_5_4/ext/mysqli/mysqli.c 2011-09-06 05:13:47 UTC (rev 316203) +++ php/php-src/branches/PHP_5_4/ext/mysqli/mysqli.c 2011-09-06 05:20:05 UTC (rev 316204) @@ -809,10 +809,10 @@ #ifdef MYSQLI_USE_MYSQLND REGISTER_LONG_CONSTANT("MYSQLI_DEBUG_TRACE_ENABLED", MYSQLND_DBG_ENABLED, CONST_CS | CONST_PERSISTENT); #else -#ifndef DBUG_OFF +#ifdef DBUG_ON + REGISTER_LONG_CONSTANT("MYSQLI_DEBUG_TRACE_ENABLED", 1, CONST_CS | CONST_PERSISTENT); +#else REGISTER_LONG_CONSTANT("MYSQLI_DEBUG_TRACE_ENABLED", 0, CONST_CS | CONST_PERSISTENT); -#else - REGISTER_LONG_CONSTANT("MYSQLI_DEBUG_TRACE_ENABLED", 1, CONST_CS | CONST_PERSISTENT); #endif #endif Modified: php/php-src/trunk/ext/mysqli/mysqli.c =================================================================== --- php/php-src/trunk/ext/mysqli/mysqli.c 2011-09-06 05:13:47 UTC (rev 316203) +++ php/php-src/trunk/ext/mysqli/mysqli.c 2011-09-06 05:20:05 UTC (rev 316204) @@ -809,10 +809,10 @@ #ifdef MYSQLI_USE_MYSQLND REGISTER_LONG_CONSTANT("MYSQLI_DEBUG_TRACE_ENABLED", MYSQLND_DBG_ENABLED, CONST_CS | CONST_PERSISTENT); #else -#ifndef DBUG_OFF +#ifdef DBUG_ON + REGISTER_LONG_CONSTANT("MYSQLI_DEBUG_TRACE_ENABLED", 1, CONST_CS | CONST_PERSISTENT); +#else REGISTER_LONG_CONSTANT("MYSQLI_DEBUG_TRACE_ENABLED", 0, CONST_CS | CONST_PERSISTENT); -#else - REGISTER_LONG_CONSTANT("MYSQLI_DEBUG_TRACE_ENABLED", 1, CONST_CS | CONST_PERSISTENT); #endif #endif