svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/tests/mysqli_constants.phpt trunk/ext/mysqli/tests/mysqli_constants.phpt
| From: | Ulf Wendel | Date: | Mon, 04 Jan 2010 15:29:18 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/tests/mysqli_constants.phpt trunk/ext/mysqli/tests/mysqli_constants.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-61469@lists.php.net to get a copy of this message | ||
uw Mon, 04 Jan 2010 15:29:18 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=293086
Log:
Updating test to new libmysql feature set (first introduced in MySQL 6.0 but now backported to MySQL
5.5).
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_constants.phpt
U php/php-src/trunk/ext/mysqli/tests/mysqli_constants.phpt
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_constants.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_constants.phpt 2010-01-04 15:05:34 UTC (rev
293085)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_constants.phpt 2010-01-04 15:29:18 UTC (rev
293086)
@@ -117,7 +117,9 @@
if (($version > 51122 && $version < 60000) || ($version > 60003) || $IS_MYSQLND)
{
$expected_constants['MYSQLI_ON_UPDATE_NOW_FLAG'] = true;
}
- if ($version > 60005 || $IS_MYSQLND) {
+
+ /* First introduced in MySQL 6.0, backported to MySQL 5.5 */
+ if ($version >= 50500 || $IS_MYSQLND) {
$expected_constants['MYSQLI_SERVER_QUERY_WAS_SLOW'] = true;
}
Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_constants.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/mysqli_constants.phpt 2010-01-04 15:05:34 UTC (rev 293085)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_constants.phpt 2010-01-04 15:29:18 UTC (rev 293086)
@@ -117,7 +117,9 @@
if (($version > 51122 && $version < 60000) || ($version > 60003) || $IS_MYSQLND)
{
$expected_constants['MYSQLI_ON_UPDATE_NOW_FLAG'] = true;
}
- if ($version > 60005 || $IS_MYSQLND) {
+
+ /* First introduced in MySQL 6.0, backported to MySQL 5.5 */
+ if ($version >= 50500 || $IS_MYSQLND) {
$expected_constants['MYSQLI_SERVER_QUERY_WAS_SLOW'] = true;
}