diff --git a/ChangeLog b/ChangeLog
index f31197971d..1c5d007b93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -77,6 +77,7 @@ VerboseMultiSubmit, ReplaceHelpImg
 + [designer] Fullscreen mode for the designer
 + Upgraded jquery to v1.8.3 and jquery-ui to v1.9.2
 + Patch #3597529 [status] Add raw value as title on server status page
++ Support MySQL 5.6 partitioning
 
 3.5.6.0 (not yet released)
 - bug #3593604 [status] Erroneous advisor rule
diff --git a/libraries/Partition.class.php b/libraries/Partition.class.php
index 63585371ab..ef69c4663a 100644
--- a/libraries/Partition.class.php
+++ b/libraries/Partition.class.php
@@ -45,8 +45,25 @@ class PMA_Partition
         static $already_checked = false;
 
         if (! $already_checked) {
-            $have_partitioning = PMA_MYSQL_INT_VERSION >= 50100 && PMA_DBI_fetch_value("SHOW VARIABLES LIKE 'have_partitioning';");
+            if (PMA_MYSQL_INT_VERSION >= 50100) {
+                if (PMA_MYSQL_INT_VERSION < 50600) {
+                    if (PMA_DBI_fetch_value(
+                        "SHOW VARIABLES LIKE 'have_partitioning';"
+                        )) {
+                        $have_partitioning = true;
+                        }
+                } else {
+                // see http://dev.mysql.com/doc/refman/5.6/en/partitioning.html
+                    $plugins = PMA_DBI_fetch_result("SHOW PLUGINS");
+                    foreach ($plugins as $key => $value) {
+                        if ($value['Name'] == 'partition') {
+                            $have_partitioning = true;
+                            break;
+                        }
+                    }
+                }
             $already_checked = true;
+            }
         }
         return $have_partitioning;
     }
diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php
index 365852adbc..ed71f68470 100644
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -1546,9 +1546,9 @@ function PMA_DBI_postConnect($link, $is_controluser = false)
  *
  * @param string|mysql_result $result     query or mysql result
  * @param integer             $row_number row to fetch the value from,
- *                                        starting at 0, with 0 beeing default
+ *                                        starting at 0, with 0 being default
  * @param integer|string      $field      field to fetch the value from,
- *                                        starting at 0, with 0 beeing default
+ *                                        starting at 0, with 0 being default
  * @param resource            $link       mysql link
  *
  * @return mixed value of first field in first row from result