diff --git a/libraries/data_drizzle.inc.php b/libraries/data_drizzle.inc.php
index 7b06ee075a..f8b9dc9469 100644
--- a/libraries/data_drizzle.inc.php
+++ b/libraries/data_drizzle.inc.php
@@ -1,10 +1,12 @@
 <?php
 /**
- * Column types and functions supported by MySQL
+ * Column types and functions supported by Drizzle
  *
  * @package PhpMyAdmin
  */
 
+$auto_column_types = empty($cfg['ColumnTypes']);
+
 // VARCHAR, TINYINT, TEXT and DATE are listed first, based on estimated popularity
 $cfg['ColumnTypes'] = !empty($cfg['ColumnTypes']) ? $cfg['ColumnTypes'] : array(
     // most used
@@ -39,12 +41,20 @@ $cfg['ColumnTypes'] = !empty($cfg['ColumnTypes']) ? $cfg['ColumnTypes'] : array(
     'STRING' => array(
         'VARCHAR',
         'TEXT',
+        '-',
         'VARBINARY',
         'BLOB',
+        '-',
         'ENUM',
     ),
 );
 
+if ($auto_column_types && PMA_MYSQL_INT_VERSION >= 20120130) {
+    $cfg['ColumnTypes']['STRING'][] = '-';
+    $cfg['ColumnTypes']['STRING'][] = 'IPV6';
+}
+unset($auto_column_types);
+
 $cfg['AttributeTypes'] = !empty($cfg['AttributeTypes']) ? $cfg['AttributeTypes'] : array(
    '',
    'on update CURRENT_TIMESTAMP',
@@ -89,6 +99,7 @@ if ($cfg['ShowFunctionFields']) {
             'QUOTE',
             'REVERSE',
             'RTRIM',
+            'SCHEMA',
             'SPACE',
             'TRIM',
             'UNCOMPRESS',
@@ -169,27 +180,6 @@ if ($cfg['ShowFunctionFields']) {
             'WEEKOFYEAR',
             'YEARWEEK',
         ),
-
-        'FUNC_SPATIAL' => array(
-            'GeomFromText',
-            'GeomFromWKB',
-
-            'GeomCollFromText',
-            'LineFromText',
-            'MLineFromText',
-            'PointFromText',
-            'MPointFromText',
-            'PolyFromText',
-            'MPolyFromText',
-
-            'GeomCollFromWKB',
-            'LineFromWKB',
-            'MLineFromWKB',
-            'PointFromWKB',
-            'MPointFromWKB',
-            'PolyFromWKB',
-            'MPolyFromWKB',
-        ),
     );
     $cfg_default_restrict_funcs = empty($cfg['RestrictFunctions']);
     if ($cfg_default_restrict_funcs) {
diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php
index e1652fe49f..8b02fd1057 100644
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -1847,7 +1847,7 @@ function PMA_DBI_formatError($error_number, $error_message)
 function PMA_is_system_schema($schema_name, $test_for_mysql_schema = false)
 {
     return strtolower($schema_name) == 'information_schema'
-            || strtolower($schema_name) == 'performance_schema'
+            || (!PMA_DRIZZLE && strtolower($schema_name) == 'performance_schema')
             || (PMA_DRIZZLE && strtolower($schema_name) == 'data_dictionary')
             || ($test_for_mysql_schema && !PMA_DRIZZLE && $schema_name == 'mysql');
 }