diff options
| author | Andrey Hristov <andrey@php.net> | 2012-10-17 17:23:37 +0200 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2012-10-17 17:23:37 +0200 |
| commit | 7314ed535f93841ff2d2bca5e65afcb0f2b003bb (patch) | |
| tree | bceec620f2cb1d5f255196e00ae7ea1187b41fe2 /ext/mysql | |
| parent | c50d732f7686352381d44926988aca194204433d (diff) | |
| parent | da541ff561e0ac6ac72d2efd8b785ecfeef868dc (diff) | |
| download | php-git-7314ed535f93841ff2d2bca5e65afcb0f2b003bb.tar.gz | |
Merge branch 'PHP-5.3' of ssh://git.php.net/php-src into PHP-5.3
Diffstat (limited to 'ext/mysql')
| -rw-r--r--[-rwxr-xr-x] | ext/mysql/tests/001.phpt | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | ext/mysql/tests/002.phpt | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | ext/mysql/tests/003.phpt | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | ext/mysql/tests/connect.inc | 0 | ||||
| -rw-r--r-- | ext/mysql/tests/mysql_field_flags.phpt | 8 | ||||
| -rw-r--r--[-rwxr-xr-x] | ext/mysql/tests/mysql_pconn_kill.phpt | 0 | ||||
| -rw-r--r-- | ext/mysql/tests/mysql_stat.phpt | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | ext/mysql/tests/skipif.inc | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | ext/mysql/tests/skipifconnectfailure.inc | 0 |
9 files changed, 8 insertions, 4 deletions
diff --git a/ext/mysql/tests/001.phpt b/ext/mysql/tests/001.phpt index 72b6614771..72b6614771 100755..100644 --- a/ext/mysql/tests/001.phpt +++ b/ext/mysql/tests/001.phpt diff --git a/ext/mysql/tests/002.phpt b/ext/mysql/tests/002.phpt index 8355c5f11e..8355c5f11e 100755..100644 --- a/ext/mysql/tests/002.phpt +++ b/ext/mysql/tests/002.phpt diff --git a/ext/mysql/tests/003.phpt b/ext/mysql/tests/003.phpt index 2d0b68b9f8..2d0b68b9f8 100755..100644 --- a/ext/mysql/tests/003.phpt +++ b/ext/mysql/tests/003.phpt diff --git a/ext/mysql/tests/connect.inc b/ext/mysql/tests/connect.inc index 0df5bc3aa0..0df5bc3aa0 100755..100644 --- a/ext/mysql/tests/connect.inc +++ b/ext/mysql/tests/connect.inc 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_pconn_kill.phpt b/ext/mysql/tests/mysql_pconn_kill.phpt index 20dfbe9a15..20dfbe9a15 100755..100644 --- a/ext/mysql/tests/mysql_pconn_kill.phpt +++ b/ext/mysql/tests/mysql_pconn_kill.phpt 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! diff --git a/ext/mysql/tests/skipif.inc b/ext/mysql/tests/skipif.inc index 0f932892ca..0f932892ca 100755..100644 --- a/ext/mysql/tests/skipif.inc +++ b/ext/mysql/tests/skipif.inc diff --git a/ext/mysql/tests/skipifconnectfailure.inc b/ext/mysql/tests/skipifconnectfailure.inc index a57c7dbd58..a57c7dbd58 100755..100644 --- a/ext/mysql/tests/skipifconnectfailure.inc +++ b/ext/mysql/tests/skipifconnectfailure.inc |