diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-11 12:25:54 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-11 12:25:54 -0500 |
| commit | 5b81cad775bcb65fc48a17e5e80c4bde61ac502d (patch) | |
| tree | 041c58024b44e12c1dc10aaba7d525e8787f1159 | |
| parent | 36338a0d7baef02ac6d763cdbc32693819b7372c (diff) | |
| parent | 900525a0e45abb283bfa9699858823d449be8dd0 (diff) | |
| download | forums-5b81cad775bcb65fc48a17e5e80c4bde61ac502d.tar forums-5b81cad775bcb65fc48a17e5e80c4bde61ac502d.tar.gz forums-5b81cad775bcb65fc48a17e5e80c4bde61ac502d.tar.bz2 forums-5b81cad775bcb65fc48a17e5e80c4bde61ac502d.tar.xz forums-5b81cad775bcb65fc48a17e5e80c4bde61ac502d.zip | |
Merge branch 'develop-olympus' into develop
# By Igor Wiedler
# Via Igor Wiedler (1) and Nathaniel Guse (1)
* develop-olympus:
[ticket/11644] Skip phpbb_dbal_order_lower_test on MySQL 5.6
| -rw-r--r-- | tests/dbal/order_lower_test.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/dbal/order_lower_test.php b/tests/dbal/order_lower_test.php index 84d454742f..d826765681 100644 --- a/tests/dbal/order_lower_test.php +++ b/tests/dbal/order_lower_test.php @@ -18,6 +18,11 @@ class phpbb_dbal_order_lower_test extends phpbb_database_test_case { $db = $this->new_dbal(); + if (strpos($db->sql_layer, 'mysql') === 0 && version_compare($db->sql_server_info(true, false), '5.6', '>=')) + { + $this->markTestSkipped('MySQL 5.6 fails to order things correctly. See also: http://tracker.phpbb.com/browse/PHPBB3-11571 http://bugs.mysql.com/bug.php?id=69005'); + } + // http://tracker.phpbb.com/browse/PHPBB3-10507 // Test ORDER BY LOWER(style_name) $db->sql_return_on_error(true); @@ -58,7 +63,7 @@ class phpbb_dbal_order_lower_test extends phpbb_database_test_case 'style_parent_id' => 0, 'style_parent_tree' => '', ) - ), + ), $db->sql_fetchrowset($result) ); } |