diff options
| author | Anatol Belski <ab@php.net> | 2017-12-21 18:38:53 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-12-21 18:38:53 +0100 |
| commit | 55bc1516087be950912991458814eb9db5121f5b (patch) | |
| tree | f2bc68f2bc31a362d3fe7b7c6b614bc9b218048d | |
| parent | fc9c8e479b73540077b2e09e7ba103fa9e9d0086 (diff) | |
| parent | 4d45f53e8726f5513e22b6592b02390d5eb77d3f (diff) | |
| download | php-git-55bc1516087be950912991458814eb9db5121f5b.tar.gz | |
Merge branch 'PHP-7.2'
* PHP-7.2:
Ensure expected items delivered in same order
| -rw-r--r-- | ext/pdo_odbc/tests/long_columns.phpt | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/ext/pdo_odbc/tests/long_columns.phpt b/ext/pdo_odbc/tests/long_columns.phpt index e3430ded47..cc7b19517e 100644 --- a/ext/pdo_odbc/tests/long_columns.phpt +++ b/ext/pdo_odbc/tests/long_columns.phpt @@ -77,7 +77,7 @@ foreach ($sizes as $num) { } // verify data -foreach ($db->query('SELECT id, data from TEST') as $row) { +foreach ($db->query('SELECT id, data from TEST ORDER BY LEN(data) ASC') as $row) { $expect = alpha_repeat($row[0]); if (strcmp($expect, $row[1])) { echo "Failed on size $row[id]:\n"; @@ -103,31 +103,31 @@ Passed on size 255 Passed on size 256 Passed on size 257 Passed on size 258 -Passed on size 1022 -Passed on size 1023 -Passed on size 1024 -Passed on size 1025 -Passed on size 1026 Passed on size 510 Passed on size 511 Passed on size 512 Passed on size 513 Passed on size 514 +Passed on size 1022 +Passed on size 1023 +Passed on size 1024 +Passed on size 1025 +Passed on size 1026 Passed on size 1278 Passed on size 1279 Passed on size 1280 Passed on size 1281 Passed on size 1282 -Passed on size 2046 -Passed on size 2047 -Passed on size 2048 -Passed on size 2049 -Passed on size 2050 Passed on size 1534 Passed on size 1535 Passed on size 1536 Passed on size 1537 Passed on size 1538 +Passed on size 2046 +Passed on size 2047 +Passed on size 2048 +Passed on size 2049 +Passed on size 2050 Passed on size 3070 Passed on size 3071 Passed on size 3072 @@ -137,4 +137,3 @@ Passed on size 3998 Passed on size 3999 Passed on size 4000 Finished - |