Merge remote-tracking branch 'origin/master'

libraries/StorageEngine.class.php

@@ -381,7 +381,7 @@ class PMA_StorageEngine
 
     /**
      * returns string with filename for the MySQL helppage
-     * about this storage engne
+     * about this storage engine
      *
      * @return string  mysql helppage filename
      */

libraries/engines/bdb.lib.php

@@ -71,7 +71,7 @@ class PMA_StorageEngine_bdb extends PMA_StorageEngine
 
     /**
      * returns string with filename for the MySQL helppage
-     * about this storage engne
+     * about this storage engine
      *
      * @return string  mysql helppage filename
      */

libraries/engines/binlog.lib.php

@@ -15,7 +15,7 @@ class PMA_StorageEngine_binlog extends PMA_StorageEngine
 {
     /**
      * returns string with filename for the MySQL helppage
-     * about this storage engne
+     * about this storage engine
      *
      * @return string  mysql helppage filename
      */

libraries/engines/innodb.lib.php

@@ -347,13 +347,13 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine
 
     /**
      * returns string with filename for the MySQL helppage
-     * about this storage engne
+     * about this storage engine
      *
      * @return string  mysql helppage filename
      */
     function getMysqlHelpPage()
     {
-        return 'innodb';
+        return 'innodb-storage-engine';
     }
 
     /**

libraries/engines/mrg_myisam.lib.php

@@ -20,13 +20,13 @@ class PMA_StorageEngine_mrg_myisam extends PMA_StorageEngine_merge
 {
     /**
      * returns string with filename for the MySQL helppage
-     * about this storage engne
+     * about this storage engine
      *
      * @return string  mysql helppage filename
      */
     function getMysqlHelpPage()
     {
-        return 'merge';
+        return 'merge-storage-engine';
     }
 }
 

libraries/engines/performance_schema.lib.php

@@ -0,0 +1,28 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * @package PhpMyAdmin-Engines
+ */
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
+/**
+ *
+ * @package PhpMyAdmin-Engines
+ */
+class PMA_StorageEngine_performance_schema extends PMA_StorageEngine
+{
+    /**
+     * returns string with filename for the MySQL helppage
+     * about this storage engine
+     *
+     * @return string  mysql helppage filename
+     */
+    function getMysqlHelpPage()
+    {
+        return 'performance-schema';
+    }
+}
+
+?>

test/engines/PMA_StorageEngine_innodb_test.php

@@ -299,7 +299,7 @@ class PMA_StorageEngine_innodb_test extends PHPUnit_Framework_TestCase
     public function testGetMysqlHelpPage()
     {
         $this->assertEquals(
-            'innodb',
+            'innodb-storage-engine',
             $this->object->getMysqlHelpPage()
         );
 

test/engines/PMA_StorageEngine_mrg_myisam_test.php

@@ -52,7 +52,7 @@ class PMA_StorageEngine_mrg_myisam_test extends PHPUnit_Framework_TestCase
     {
         $this->assertEquals(
             $this->object->getMysqlHelpPage(),
-            'merge'
+            'merge-storage-engine'
         );
 
     }