From 4bc1d1a0f22c2598a1ca69f23de01050c40d92fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Wed, 5 Sep 2012 16:42:05 +0200
Subject: [PATCH 1/2] Force utf8 encoding for this test

---
 test/libraries/PMA_SQL_parser_test.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/test/libraries/PMA_SQL_parser_test.php b/test/libraries/PMA_SQL_parser_test.php
index 65418d9f75..1e84a53b7f 100644
--- a/test/libraries/PMA_SQL_parser_test.php
+++ b/test/libraries/PMA_SQL_parser_test.php
@@ -13,6 +13,18 @@ require_once 'libraries/sqlparser.lib.php';
 
 class PMA_SQL_parser_test extends PHPUnit_Framework_TestCase
 {
+    /**
+     * Prepares environment for the test.
+     *
+     * @return void
+     */
+    public function setUp()
+    {
+        if (function_exists('mb_internal_encoding')) {
+            mb_internal_encoding('utf-8');
+        }
+    }
+
     /**
      * Testing of SQL parser.
      *

From ad8052c9fc36443c02cd6fff2549865d18d6acf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Wed, 5 Sep 2012 16:43:17 +0200
Subject: [PATCH 2/2] All parser tests might need some time

---
 test/libraries/PMA_SQL_parser_test.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/libraries/PMA_SQL_parser_test.php b/test/libraries/PMA_SQL_parser_test.php
index 1e84a53b7f..464339779c 100644
--- a/test/libraries/PMA_SQL_parser_test.php
+++ b/test/libraries/PMA_SQL_parser_test.php
@@ -35,6 +35,7 @@ class PMA_SQL_parser_test extends PHPUnit_Framework_TestCase
      * @return void
      *
      * @dataProvider parserData
+     * @group medium
      */
     public function testParser($sql, $expected, $error = '')
     {