aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorNathaniel Guse <nathaniel.guse@gmail.com>2013-07-11 12:25:25 -0500
committerNathaniel Guse <nathaniel.guse@gmail.com>2013-07-11 12:25:25 -0500
commit900525a0e45abb283bfa9699858823d449be8dd0 (patch)
treeaaab80c42ff60b4e7c3735a15b7af0e5522408ad /tests
parentece01f0a1f31ac45761043dbc3515374a4a81dc8 (diff)
parent20d59c49e28511920693bb6bfb7b219e17106140 (diff)
downloadforums-900525a0e45abb283bfa9699858823d449be8dd0.tar
forums-900525a0e45abb283bfa9699858823d449be8dd0.tar.gz
forums-900525a0e45abb283bfa9699858823d449be8dd0.tar.bz2
forums-900525a0e45abb283bfa9699858823d449be8dd0.tar.xz
forums-900525a0e45abb283bfa9699858823d449be8dd0.zip
Merge remote-tracking branch 'remotes/igorw/ticket/11644' into develop-olympus
# By Igor Wiedler # Via Igor Wiedler * remotes/igorw/ticket/11644: [ticket/11644] Skip phpbb_dbal_order_lower_test on MySQL 5.6
Diffstat (limited to 'tests')
-rw-r--r--tests/dbal/order_lower_test.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/dbal/order_lower_test.php b/tests/dbal/order_lower_test.php
index b07f1baa91..e17295a4ea 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);
@@ -55,7 +60,7 @@ class phpbb_dbal_order_lower_test extends phpbb_database_test_case
'theme_id' => 2,
'imageset_id' => 2
)
- ),
+ ),
$db->sql_fetchrowset($result)
);
}