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/mysql | |
| 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/mysql')
| -rw-r--r-- | ext/mysql/tests/mysql_field_flags.phpt | 8 | ||||
| -rw-r--r-- | ext/mysql/tests/mysql_stat.phpt | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/ext/mysql/tests/mysql_field_flags.phpt b/ext/mysql/tests/mysql_field_flags.phpt index 6489affc16..e07e041d2a 100644 --- a/ext/mysql/tests/mysql_field_flags.phpt +++ b/ext/mysql/tests/mysql_field_flags.phpt @@ -81,13 +81,17 @@ $tables = array( array('label1', sprintf("'%s'", @date("Y-m-d H:i:s"))), 'label1' => array( 'timestamp', - 'unsigned', - 'zerofill', 'binary', 'not_null'), ), ); +if ($version < 560) { + $tables['label1 TIMESTAMP']['label1'][] = 'zerofill'; + $tables['label1 TIMESTAMP']['label1'][] = 'unsigned'; +} + + foreach ($tables as $columns => $expected) { if (!mysql_query("DROP TABLE IF EXISTS test", $link)) { printf("[010/%s] [%d] %s\n", $columns, mysql_errno($link), mysql_error($link)); diff --git a/ext/mysql/tests/mysql_stat.phpt b/ext/mysql/tests/mysql_stat.phpt index 288c53f067..30a840a2a1 100644 --- a/ext/mysql/tests/mysql_stat.phpt +++ b/ext/mysql/tests/mysql_stat.phpt @@ -34,7 +34,7 @@ if ((!is_string($stat_def = mysql_stat())) || ('' === $stat_def)) printf("[003] Expecting non empty string, got %s/'%s', [%d] %s\n", gettype($stat_def), $stat_def, mysql_errno(), mysql_error()); -assert($stat === $stat_def); +assert(soundex($stat) === soundex($stat_def)); mysql_close($link); @@ -45,4 +45,4 @@ print "done!"; ?> --EXPECTF-- Warning: mysql_stat(): %d is not a valid MySQL-Link resource in %s on line %d -done!
\ No newline at end of file +done! |