[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/tests/connect.inc branches/PHP_5_4/ext/mysqli/tests/connect.inc trunk/ext/mysqli/tests/connect.inc

2011-09-06 Thread Ulf Wendel 
uw   Tue, 06 Sep 2011 16:13:03 +

Revision: http://svn.php.net/viewvc?view=revision&revision=316278

Log:
More parenthesis, credits to Nikita Popov

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqli/tests/connect.inc
U   php/php-src/branches/PHP_5_4/ext/mysqli/tests/connect.inc
U   php/php-src/trunk/ext/mysqli/tests/connect.inc

Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/connect.inc
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/connect.inc   2011-09-06 
16:10:11 UTC (rev 316277)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/connect.inc   2011-09-06 
16:13:03 UTC (rev 316278)
@@ -224,7 +224,7 @@

function have_innodb($link) {
  if (($res = $link->query("SHOW VARIABLES LIKE 
'have_innodb'")) &&
-   $row = $res->fetch_row() &&
+   ($row = $res->fetch_row()) &&
!empty($row)) {
if ($row[1] == "DISABLED" || $row[1] == "NO") {
return false;

Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/connect.inc
===
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/connect.inc   2011-09-06 
16:10:11 UTC (rev 316277)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/connect.inc   2011-09-06 
16:13:03 UTC (rev 316278)
@@ -224,7 +224,7 @@

function have_innodb($link) {
  if (($res = $link->query("SHOW VARIABLES LIKE 
'have_innodb'")) &&
-   $row = $res->fetch_row() &&
+   ($row = $res->fetch_row()) &&
!empty($row)) {
if ($row[1] == "DISABLED" || $row[1] == "NO") {
return false;

Modified: php/php-src/trunk/ext/mysqli/tests/connect.inc
===
--- php/php-src/trunk/ext/mysqli/tests/connect.inc  2011-09-06 16:10:11 UTC 
(rev 316277)
+++ php/php-src/trunk/ext/mysqli/tests/connect.inc  2011-09-06 16:13:03 UTC 
(rev 316278)
@@ -224,7 +224,7 @@

function have_innodb($link) {
  if (($res = $link->query("SHOW VARIABLES LIKE 
'have_innodb'")) &&
-   $row = $res->fetch_row() &&
+   ($row = $res->fetch_row()) &&
!empty($row)) {
if ($row[1] == "DISABLED" || $row[1] == "NO") {
return false;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/tests/connect.inc branches/PHP_5_4/ext/mysqli/tests/connect.inc trunk/ext/mysqli/tests/connect.inc

2011-09-06 Thread Ulf Wendel 
uw   Tue, 06 Sep 2011 13:39:46 +

Revision: http://svn.php.net/viewvc?view=revision&revision=316257

Log:
Prevent Notice

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqli/tests/connect.inc
U   php/php-src/branches/PHP_5_4/ext/mysqli/tests/connect.inc
U   php/php-src/trunk/ext/mysqli/tests/connect.inc

Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/connect.inc
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/connect.inc   2011-09-06 
13:38:14 UTC (rev 316256)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/connect.inc   2011-09-06 
13:39:46 UTC (rev 316257)
@@ -223,7 +223,7 @@
}

function have_innodb($link) {
- if ($res = $link->query("SHOW VARIABLES LIKE 'have_innodb'") 
&&
+ if (($res = $link->query("SHOW VARIABLES LIKE 
'have_innodb'")) &&
$row = $res->fetch_row() &&
!empty($row)) {
if ($row[1] == "DISABLED" || $row[1] == "NO") {

Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/connect.inc
===
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/connect.inc   2011-09-06 
13:38:14 UTC (rev 316256)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/connect.inc   2011-09-06 
13:39:46 UTC (rev 316257)
@@ -223,7 +223,7 @@
}

function have_innodb($link) {
- if ($res = $link->query("SHOW VARIABLES LIKE 'have_innodb'") 
&&
+ if (($res = $link->query("SHOW VARIABLES LIKE 
'have_innodb'")) &&
$row = $res->fetch_row() &&
!empty($row)) {
if ($row[1] == "DISABLED" || $row[1] == "NO") {

Modified: php/php-src/trunk/ext/mysqli/tests/connect.inc
===
--- php/php-src/trunk/ext/mysqli/tests/connect.inc  2011-09-06 13:38:14 UTC 
(rev 316256)
+++ php/php-src/trunk/ext/mysqli/tests/connect.inc  2011-09-06 13:39:46 UTC 
(rev 316257)
@@ -223,7 +223,7 @@
}

function have_innodb($link) {
- if ($res = $link->query("SHOW VARIABLES LIKE 'have_innodb'") 
&&
+ if (($res = $link->query("SHOW VARIABLES LIKE 
'have_innodb'")) &&
$row = $res->fetch_row() &&
!empty($row)) {
if ($row[1] == "DISABLED" || $row[1] == "NO") {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php