Merge remote-tracking branch 'origin/master'

ChangeLog

@@ -46,6 +46,7 @@ phpMyAdmin - ChangeLog
 - bug #4872 Drop table doesn't remove the table name from navigation bar
 + rfe #1675 MySQL and MariaDB functions INET6_ATON and INET6_NTOA
 - bug       Link to get real row counts of all the views in a db, at once
+- bug #4932 Drizzle version numbers
 
 4.4.9.0 (not yet released)
 - bug #4920 relation view doesn't list fields of table in other database

libraries/Types.class.php

@@ -1037,7 +1037,7 @@ class PMA_Types_Drizzle extends PMA_Types
             '-',
             'ENUM',
         );
-        if (PMA_MYSQL_INT_VERSION >= 20120130) {
+        if (PMA_DRIZZLE && PMA_MYSQL_INT_VERSION >= 70132) {
             $types_string[] = '-';
             $types_string[] = 'IPV6';
         }