Index: branches/5.2.x/core/kernel/db/db_load_balancer.php =================================================================== diff -u -N -r16658 -r16662 --- branches/5.2.x/core/kernel/db/db_load_balancer.php (.../db_load_balancer.php) (revision 16658) +++ branches/5.2.x/core/kernel/db/db_load_balancer.php (.../db_load_balancer.php) (revision 16662) @@ -1,6 +1,6 @@ nextQueryCachable && is_object($conn) ) { - $conn->nextQueryCachable = true; - $this->nextQueryCachable = false; + if ( is_object($conn) ) { + $conn->noDebuggingState = $this->noDebuggingState; + + if ( $this->nextQueryCachable ) { + $conn->nextQueryCachable = true; + $this->nextQueryCachable = false; + } } return $conn; @@ -569,11 +580,11 @@ * * @param string $sql * @param string $key_field - * @param bool $no_debug + * @param boolean|null $no_debug * @return Array * @access public */ - public function Query($sql, $key_field = null, $no_debug = false) + public function Query($sql, $key_field = null, $no_debug = null) { $conn =& $this->chooseConnection($sql); @@ -588,12 +599,12 @@ * * @param string $sql * @param string $key_field - * @param bool $no_debug + * @param boolean|null $no_debug * @param string $iterator_class * @return kMySQLQuery|bool * @access public */ - public function GetIterator($sql, $key_field = null, $no_debug = false, $iterator_class = 'kMySQLQuery') + public function GetIterator($sql, $key_field = null, $no_debug = null, $iterator_class = 'kMySQLQuery') { $conn =& $this->chooseConnection($sql);