diff options
| author | ULF WENDEL <uw@php.net> | 2012-09-29 12:17:13 +0200 |
|---|---|---|
| committer | ULF WENDEL <uw@php.net> | 2012-09-29 12:17:13 +0200 |
| commit | 13d4d8e2d037385bfa2c7775929b65ae1f73998d (patch) | |
| tree | 934902490f62df7e1d09928f1934adc5f433c21a /ext/mysqli | |
| parent | c8cc0cde34879647a1d7f957e745ff4de74e7b98 (diff) | |
| parent | 20e76f4487baf60dc52b348e86bae4628026c4c2 (diff) | |
| download | php-git-13d4d8e2d037385bfa2c7775929b65ae1f73998d.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Minor changes for MySQL 5.6
NEWS for 76601c4
Conflicts:
NEWS
Diffstat (limited to 'ext/mysqli')
| -rw-r--r-- | ext/mysqli/tests/bug55859.phpt | 4 | ||||
| -rw-r--r-- | ext/mysqli/tests/mysqli_class_mysqli_interface.phpt | 2 | ||||
| -rw-r--r-- | ext/mysqli/tests/mysqli_fetch_field_flags.phpt | 6 |
3 files changed, 9 insertions, 3 deletions
diff --git a/ext/mysqli/tests/bug55859.phpt b/ext/mysqli/tests/bug55859.phpt index a8bb4b3f24..ba6e9902b3 100644 --- a/ext/mysqli/tests/bug55859.phpt +++ b/ext/mysqli/tests/bug55859.phpt @@ -12,9 +12,9 @@ require_once('skipifconnectfailure.inc'); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
printf("[001] Connect failed, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
}
- var_dump(mysqli_stat($link) === $link->stat);
+ var_dump(soundex(mysqli_stat($link)) === soundex($link->stat));
echo "done!";
?>
--EXPECT--
bool(true)
-done!
\ No newline at end of file +done!
diff --git a/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt b/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt index c6d4e7cc32..df7d1c6580 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt @@ -211,7 +211,7 @@ require_once('skipifconnectfailure.inc'); $mysqli->sqlstate, gettype($mysqli->sqlstate), mysqli_sqlstate($link), gettype(mysqli_sqlstate($link))); - assert(mysqli_stat($link) === $mysqli->stat); + assert(soundex(mysqli_stat($link)) == soundex($mysqli->stat)); printf("mysqli->stat = '%s'/%s ('%s'/%s)\n", $mysqli->stat, gettype($mysqli->stat), mysqli_stat($link), gettype(mysqli_stat($link))); diff --git a/ext/mysqli/tests/mysqli_fetch_field_flags.phpt b/ext/mysqli/tests/mysqli_fetch_field_flags.phpt index 42cbc1487f..8259d2f505 100644 --- a/ext/mysqli/tests/mysqli_fetch_field_flags.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field_flags.phpt @@ -84,6 +84,8 @@ mysqli_close($link); 'VARCHAR(2) NOT NULL PRIMARY KEY' => 'NOT_NULL PRI_KEY NO_DEFAULT_VALUE PART_KEY' ); + + function checkFlags($reported_flags, $expected_flags, $flags) { $found_flags = $unexpected_flags = ''; foreach ($flags as $code => $name) { @@ -104,6 +106,10 @@ mysqli_close($link); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + if (mysqli_get_server_version($link) > 50600) { + $columns['TIMESTAMP NOT NULL'] = 'ON_UPDATE_NOW TIMESTAMP BINARY NOT_NULL'; + } + foreach ($columns as $column_def => $expected_flags) { if (!mysqli_query($link, 'DROP TABLE IF EXISTS test')) { printf("[002] %s [%d] %s\n", $column_def, |