diff --git a/libraries/dbi/DBIDummy.class.php b/libraries/dbi/DBIDummy.class.php
index e03e418fca..1aeefac4f6 100644
--- a/libraries/dbi/DBIDummy.class.php
+++ b/libraries/dbi/DBIDummy.class.php
@@ -54,7 +54,9 @@ $GLOBALS['dummy_queries'] = array(
         )
     ),
     array(
-        'query' => 'SHOW STATUS WHERE Variable_name LIKE \'Innodb\\_buffer\\_pool\\_%\' OR Variable_name = \'Innodb_page_size\';',
+        'query' => 'SHOW STATUS WHERE Variable_name'
+            . ' LIKE \'Innodb\\_buffer\\_pool\\_%\''
+            . ' OR Variable_name = \'Innodb_page_size\';',
         'result' => array(
             array('Innodb_buffer_pool_pages_data', 0),
             array('Innodb_buffer_pool_pages_dirty', 0),
@@ -152,16 +154,25 @@ $GLOBALS['dummy_queries'] = array(
     array(
         'query' => 'SHOW COLUMNS FROM `pma`.`table1`',
         'columns' => array(
-            'Field', 'Type', 'Null', 'Key', 'Default', 'Extra', 'Privileges', 'Comment'
+            'Field', 'Type', 'Null', 'Key', 'Default', 'Extra',
+            'Privileges', 'Comment'
         ),
         'result' => array(
-            array('i', 'int(11)', 'NO', 'PRI', 'NULL', 'auto_increment', 'select,insert,update,references', ''),
-            array('o', 'varchar(100)', 'NO', 'MUL', 'NULL', '', 'select,insert,update,references', ''),
+            array(
+                'i', 'int(11)', 'NO', 'PRI', 'NULL', 'auto_increment',
+                'select,insert,update,references', ''
+            ),
+            array(
+                'o', 'varchar(100)', 'NO', 'MUL', 'NULL', '',
+                'select,insert,update,references', ''
+            ),
         )
     ),
     array(
         'query' => 'SELECT * FROM information_schema.CHARACTER_SETS',
-        'columns' => array('CHARACTER_SET_NAME', 'DEFAULT_COLLATE_NAME', 'DESCRIPTION', 'MAXLEN'),
+        'columns' => array(
+            'CHARACTER_SET_NAME', 'DEFAULT_COLLATE_NAME', 'DESCRIPTION', 'MAXLEN'
+        ),
         'result' => array(
             array('utf8', 'utf8_general_ci', 'UTF-8 Unicode', 3),
         )
@@ -169,7 +180,8 @@ $GLOBALS['dummy_queries'] = array(
     array(
         'query' => 'SELECT * FROM information_schema.COLLATIONS',
         'columns' => array(
-            'COLLATION_NAME', 'CHARACTER_SET_NAME', 'ID', 'IS_DEFAULT', 'IS_COMPILED', 'SORTLEN'
+            'COLLATION_NAME', 'CHARACTER_SET_NAME', 'ID', 'IS_DEFAULT',
+            'IS_COMPILED', 'SORTLEN'
         ),
         'result' => array(
             array('utf8_general_ci', 'utf8', 33, 'Yes', 'Yes', 1),
@@ -177,34 +189,92 @@ $GLOBALS['dummy_queries'] = array(
         )
     ),
     array(
-        'query' => 'SELECT `TABLE_NAME` FROM `INFORMATION_SCHEMA`.`TABLES` WHERE `TABLE_SCHEMA`=\'pma_test\' AND `TABLE_TYPE`=\'BASE TABLE\'',
+        'query' => 'SELECT `TABLE_NAME` FROM `INFORMATION_SCHEMA`.`TABLES`'
+            . ' WHERE `TABLE_SCHEMA`=\'pma_test\' AND `TABLE_TYPE`=\'BASE TABLE\'',
         'result' => array(),
     ),
     array(
-        'query' => 'SELECT upper(plugin_name) f FROM data_dictionary.plugins WHERE plugin_name IN (\'MYSQL_PASSWORD\',\'ROT13\') AND plugin_type = \'Function\' AND is_active',
+        'query' => 'SELECT upper(plugin_name) f FROM data_dictionary.plugins'
+            . ' WHERE plugin_name IN (\'MYSQL_PASSWORD\',\'ROT13\')'
+            . ' AND plugin_type = \'Function\' AND is_active',
         'columns' => array('f'),
         'result' => array(array('ROT13')),
     ),
     array(
-        'query' => 'SELECT `column_name`, `mimetype`, `transformation`, `transformation_options` FROM `pmadb`.`column_info` WHERE `db_name` = \'pma_test\' AND `table_name` = \'table1\' AND ( `mimetype` != \'\' OR `transformation` != \'\' OR `transformation_options` != \'\')',
-        'columns' => array('column_name', 'mimetype', 'transformation', 'transformation_options'),
+        'query' => 'SELECT `column_name`, `mimetype`, `transformation`,'
+            . ' `transformation_options` FROM `pmadb`.`column_info`'
+            . ' WHERE `db_name` = \'pma_test\' AND `table_name` = \'table1\''
+            . ' AND ( `mimetype` != \'\' OR `transformation` != \'\''
+            . ' OR `transformation_options` != \'\')',
+        'columns' => array(
+            'column_name', 'mimetype', 'transformation', 'transformation_options'
+        ),
         'result' => array(
             array('o', 'text/plain', 'sql'),
         )
     ),
     array(
-        'query' => 'SELECT TABLE_NAME FROM information_schema.VIEWS WHERE TABLE_SCHEMA = \'pma_test\' AND TABLE_NAME = \'table1\'',
+        'query' => 'SELECT TABLE_NAME FROM information_schema.VIEWS'
+            . ' WHERE TABLE_SCHEMA = \'pma_test\' AND TABLE_NAME = \'table1\'',
         'result' => array(),
     ),
     array(
-        'query' => 'SELECT *, `TABLE_SCHEMA` AS `Db`, `TABLE_NAME` AS `Name`, `TABLE_TYPE` AS `TABLE_TYPE`, `ENGINE` AS `Engine`, `ENGINE` AS `Type`, `VERSION` AS `Version`, `ROW_FORMAT` AS `Row_format`, `TABLE_ROWS` AS `Rows`, `AVG_ROW_LENGTH` AS `Avg_row_length`, `DATA_LENGTH` AS `Data_length`, `MAX_DATA_LENGTH` AS `Max_data_length`, `INDEX_LENGTH` AS `Index_length`, `DATA_FREE` AS `Data_free`, `AUTO_INCREMENT` AS `Auto_increment`, `CREATE_TIME` AS `Create_time`, `UPDATE_TIME` AS `Update_time`, `CHECK_TIME` AS `Check_time`, `TABLE_COLLATION` AS `Collation`, `CHECKSUM` AS `Checksum`, `CREATE_OPTIONS` AS `Create_options`, `TABLE_COMMENT` AS `Comment` FROM `information_schema`.`TABLES` t WHERE BINARY `TABLE_SCHEMA` IN (\'pma_test\') AND t.`TABLE_NAME` = \'table1\' ORDER BY Name ASC',
-        'columns' => array('TABLE_CATALOG', 'TABLE_SCHEMA', 'TABLE_NAME', 'TABLE_TYPE', 'ENGINE', 'VERSION', 'ROW_FORMAT', 'TABLE_ROWS', 'AVG_ROW_LENGTH', 'DATA_LENGTH', 'MAX_DATA_LENGTH', 'INDEX_LENGTH', 'DATA_FREE', 'AUTO_INCREMENT', 'CREATE_TIME', 'UPDATE_TIME', 'CHECK_TIME', 'TABLE_COLLATION', 'CHECKSUM', 'CREATE_OPTIONS', 'TABLE_COMMENT', 'Db', 'Name', 'TABLE_TYPE', 'Engine', 'Type', 'Version', 'Row_format', 'Rows', 'Avg_row_length', 'Data_length', 'Max_data_length', 'Index_length', 'Data_free', 'Auto_increment', 'Create_time', 'Update_time', 'Check_time', 'Collation', 'Checksum', 'Create_options', 'Comment'),
+        'query' => 'SELECT *, `TABLE_SCHEMA` AS `Db`, `TABLE_NAME` AS `Name`,'
+            . ' `TABLE_TYPE` AS `TABLE_TYPE`, `ENGINE` AS `Engine`,'
+            . ' `ENGINE` AS `Type`, `VERSION` AS `Version`,'
+            . ' `ROW_FORMAT` AS `Row_format`, `TABLE_ROWS` AS `Rows`,'
+            . ' `AVG_ROW_LENGTH` AS `Avg_row_length`,'
+            . ' `DATA_LENGTH` AS `Data_length`,'
+            . ' `MAX_DATA_LENGTH` AS `Max_data_length`,'
+            . ' `INDEX_LENGTH` AS `Index_length`, `DATA_FREE` AS `Data_free`,'
+            . ' `AUTO_INCREMENT` AS `Auto_increment`,'
+            . ' `CREATE_TIME` AS `Create_time`, `UPDATE_TIME` AS `Update_time`,'
+            . ' `CHECK_TIME` AS `Check_time`, `TABLE_COLLATION` AS `Collation`,'
+            . ' `CHECKSUM` AS `Checksum`, `CREATE_OPTIONS` AS `Create_options`,'
+            . ' `TABLE_COMMENT` AS `Comment`'
+            . ' FROM `information_schema`.`TABLES` t'
+            . ' WHERE BINARY `TABLE_SCHEMA` IN (\'pma_test\')'
+            . ' AND t.`TABLE_NAME` = \'table1\' ORDER BY Name ASC',
+        'columns' => array(
+            'TABLE_CATALOG', 'TABLE_SCHEMA', 'TABLE_NAME', 'TABLE_TYPE', 'ENGINE',
+            'VERSION', 'ROW_FORMAT', 'TABLE_ROWS', 'AVG_ROW_LENGTH', 'DATA_LENGTH',
+            'MAX_DATA_LENGTH', 'INDEX_LENGTH', 'DATA_FREE', 'AUTO_INCREMENT',
+            'CREATE_TIME', 'UPDATE_TIME', 'CHECK_TIME', 'TABLE_COLLATION',
+            'CHECKSUM', 'CREATE_OPTIONS', 'TABLE_COMMENT', 'Db', 'Name',
+            'TABLE_TYPE', 'Engine', 'Type', 'Version', 'Row_format', 'Rows',
+            'Avg_row_length', 'Data_length', 'Max_data_length', 'Index_length',
+            'Data_free', 'Auto_increment', 'Create_time', 'Update_time',
+            'Check_time', 'Collation', 'Checksum', 'Create_options', 'Comment'
+        ),
         'result' => array(
-            array('def', 'smash', 'issues_issue', 'BASE TABLE', 'InnoDB', '10', 'Compact', '9136', '862', '7880704', '0', '1032192', '420478976', '155862', '2012-08-29 13:28:28', 'NULL', 'NULL', 'utf8_general_ci', 'NULL', '', '', 'smash', 'issues_issue', 'BASE TABLE', 'InnoDB', 'InnoDB', '10', 'Compact', '9136', '862', '7880704', '0', '1032192', '420478976', '155862', '2012-08-29 13:28:28', 'NULL', 'NULL', 'utf8_general_ci', 'NULL'),
+            array(
+                'def', 'smash', 'issues_issue', 'BASE TABLE', 'InnoDB', '10',
+                'Compact', '9136', '862', '7880704', '0', '1032192', '420478976',
+                '155862', '2012-08-29 13:28:28', 'NULL', 'NULL', 'utf8_general_ci',
+                'NULL', '', '', 'smash', 'issues_issue', 'BASE TABLE', 'InnoDB',
+                'InnoDB', '10', 'Compact', '9136', '862', '7880704', '0', '1032192',
+                '420478976', '155862', '2012-08-29 13:28:28', 'NULL', 'NULL',
+                'utf8_general_ci', 'NULL'
+            ),
         ),
     ),
     array(
-        'query' => 'SELECT *, `TABLE_SCHEMA` AS `Db`, `TABLE_NAME` AS `Name`, `TABLE_TYPE` AS `TABLE_TYPE`, `ENGINE` AS `Engine`, `ENGINE` AS `Type`, `VERSION` AS `Version`, `ROW_FORMAT` AS `Row_format`, `TABLE_ROWS` AS `Rows`, `AVG_ROW_LENGTH` AS `Avg_row_length`, `DATA_LENGTH` AS `Data_length`, `MAX_DATA_LENGTH` AS `Max_data_length`, `INDEX_LENGTH` AS `Index_length`, `DATA_FREE` AS `Data_free`, `AUTO_INCREMENT` AS `Auto_increment`, `CREATE_TIME` AS `Create_time`, `UPDATE_TIME` AS `Update_time`, `CHECK_TIME` AS `Check_time`, `TABLE_COLLATION` AS `Collation`, `CHECKSUM` AS `Checksum`, `CREATE_OPTIONS` AS `Create_options`, `TABLE_COMMENT` AS `Comment` FROM `information_schema`.`TABLES` t WHERE `TABLE_SCHEMA` IN (\'pma_test\') AND t.`TABLE_NAME` = \'table1\' ORDER BY Name ASC',
+        'query' => 'SELECT *, `TABLE_SCHEMA` AS `Db`, `TABLE_NAME` AS `Name`,'
+            . ' `TABLE_TYPE` AS `TABLE_TYPE`, `ENGINE` AS `Engine`,'
+            . ' `ENGINE` AS `Type`, `VERSION` AS `Version`,'
+            . ' `ROW_FORMAT` AS `Row_format`, `TABLE_ROWS` AS `Rows`,'
+            . ' `AVG_ROW_LENGTH` AS `Avg_row_length`,'
+            . ' `DATA_LENGTH` AS `Data_length`,'
+            . ' `MAX_DATA_LENGTH` AS `Max_data_length`,'
+            . ' `INDEX_LENGTH` AS `Index_length`, `DATA_FREE` AS `Data_free`,'
+            . ' `AUTO_INCREMENT` AS `Auto_increment`,'
+            . ' `CREATE_TIME` AS `Create_time`, `UPDATE_TIME` AS `Update_time`,'
+            . ' `CHECK_TIME` AS `Check_time`, `TABLE_COLLATION` AS `Collation`,'
+            . ' `CHECKSUM` AS `Checksum`, `CREATE_OPTIONS` AS `Create_options`,'
+            . ' `TABLE_COMMENT` AS `Comment`'
+            . ' FROM `information_schema`.`TABLES` t'
+            . ' WHERE `TABLE_SCHEMA` IN (\'pma_test\')'
+            . ' AND t.`TABLE_NAME` = \'table1\' ORDER BY Name ASC',
         'columns' => array('TABLE_CATALOG', 'TABLE_SCHEMA', 'TABLE_NAME',
             'TABLE_TYPE', 'ENGINE', 'VERSION', 'ROW_FORMAT', 'TABLE_ROWS',
             'AVG_ROW_LENGTH', 'DATA_LENGTH', 'MAX_DATA_LENGTH',