uw Tue, 20 Oct 2009 13:58:57 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=289797
Log: Well, hacking around to cope with mysql version specific behaviour if using libmysql... Changed paths: U php/php-src/branches/PHP_5_3/ext/mysqli/tests/071.phpt U php/php-src/trunk/ext/mysqli/tests/071.phpt Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/071.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/071.phpt 2009-10-20 13:46:54 UTC (rev 289796) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/071.phpt 2009-10-20 13:58:57 UTC (rev 289797) @@ -11,10 +11,28 @@ require_once("connect.inc"); $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket); + $version = $mysql->server_version; var_dump($mysql->ping()); - var_dump($mysql->kill($mysql->thread_id)); + $ret = $mysql->kill($mysql->thread_id); + if ($IS_MYSQLND) { + if ($ret !== true){ + printf("[001] Expecting boolean/true got %s/%s\n", gettype($ret), var_export($ret, true)); + } + } else { + /* libmysql return value seems to depend on server version */ + if (($version >= 50123 || $version <= 40200) && $version != 50200) { + /* TODO: find exact version */ + if ($ret !== true){ + printf("[001] Expecting boolean/true got %s/%s @\n", gettype($ret), var_export($ret, true), $version); + } + } else { + if ($ret !== false){ + printf("[001] Expecting boolean/false got %s/%s @\n", gettype($ret), var_export($ret, true), $version); + } + } + } var_dump($mysql->ping()); @@ -24,7 +42,24 @@ var_dump(mysqli_ping($mysql)); - var_dump(mysqli_kill($mysql, mysqli_thread_id($mysql))); + $ret = $mysql->kill($mysql->thread_id); + if ($IS_MYSQLND) { + if ($ret !== true){ + printf("[002] Expecting boolean/true got %s/%s\n", gettype($ret), var_export($ret, true)); + } + } else { + /* libmysql return value seems to depend on server version */ + if (($version >= 50123 || $version <= 40200) && $version != 50200) { + /* TODO: find exact version */ + if ($ret !== true){ + printf("[002] Expecting boolean/true got %s/%s @\n", gettype($ret), var_export($ret, true), $version); + } + } else { + if ($ret !== false){ + printf("[002] Expecting boolean/false got %s/%s @\n", gettype($ret), var_export($ret, true), $version); + } + } + } var_dump(mysqli_ping($mysql)); @@ -33,9 +68,7 @@ ?> --EXPECT-- bool(true) -bool(true) bool(false) bool(true) -bool(true) bool(false) done! \ No newline at end of file Modified: php/php-src/trunk/ext/mysqli/tests/071.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/071.phpt 2009-10-20 13:46:54 UTC (rev 289796) +++ php/php-src/trunk/ext/mysqli/tests/071.phpt 2009-10-20 13:58:57 UTC (rev 289797) @@ -11,10 +11,28 @@ require_once("connect.inc"); $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket); + $version = $mysql->server_version; var_dump($mysql->ping()); - var_dump($mysql->kill($mysql->thread_id)); + $ret = $mysql->kill($mysql->thread_id); + if ($IS_MYSQLND) { + if ($ret !== true){ + printf("[001] Expecting boolean/true got %s/%s\n", gettype($ret), var_export($ret, true)); + } + } else { + /* libmysql return value seems to depend on server version */ + if (($version >= 50123 || $version <= 40200) && $version != 50200) { + /* TODO: find exact version */ + if ($ret !== true){ + printf("[001] Expecting boolean/true got %s/%s @\n", gettype($ret), var_export($ret, true), $version); + } + } else { + if ($ret !== false){ + printf("[001] Expecting boolean/false got %s/%s @\n", gettype($ret), var_export($ret, true), $version); + } + } + } var_dump($mysql->ping()); @@ -24,7 +42,24 @@ var_dump(mysqli_ping($mysql)); - var_dump(mysqli_kill($mysql, mysqli_thread_id($mysql))); + $ret = $mysql->kill($mysql->thread_id); + if ($IS_MYSQLND) { + if ($ret !== true){ + printf("[002] Expecting boolean/true got %s/%s\n", gettype($ret), var_export($ret, true)); + } + } else { + /* libmysql return value seems to depend on server version */ + if (($version >= 50123 || $version <= 40200) && $version != 50200) { + /* TODO: find exact version */ + if ($ret !== true){ + printf("[002] Expecting boolean/true got %s/%s @\n", gettype($ret), var_export($ret, true), $version); + } + } else { + if ($ret !== false){ + printf("[002] Expecting boolean/false got %s/%s @\n", gettype($ret), var_export($ret, true), $version); + } + } + } var_dump(mysqli_ping($mysql)); @@ -33,9 +68,7 @@ ?> --EXPECT-- bool(true) -bool(true) bool(false) bool(true) -bool(true) bool(false) done! \ No newline at end of file
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php