From 73725c39245f37567c86eb93b951007e05dbde03 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 3 Feb 2013 08:13:10 -0500 Subject: [PATCH 1/2] Bug #3785 Wrong documentation links for storage engines --- libraries/engines/innodb.lib.php | 2 +- libraries/engines/mrg_myisam.lib.php | 2 +- libraries/engines/performance_schema.lib.php | 28 +++++++++++++++++++ .../engines/PMA_StorageEngine_innodb_test.php | 2 +- .../PMA_StorageEngine_mrg_myisam_test.php | 2 +- 5 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 libraries/engines/performance_schema.lib.php diff --git a/libraries/engines/innodb.lib.php b/libraries/engines/innodb.lib.php index 0644910525..a2afe440af 100644 --- a/libraries/engines/innodb.lib.php +++ b/libraries/engines/innodb.lib.php @@ -353,7 +353,7 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine */ function getMysqlHelpPage() { - return 'innodb'; + return 'innodb-storage-engine'; } /** diff --git a/libraries/engines/mrg_myisam.lib.php b/libraries/engines/mrg_myisam.lib.php index 0acbc262d8..27d585debd 100644 --- a/libraries/engines/mrg_myisam.lib.php +++ b/libraries/engines/mrg_myisam.lib.php @@ -26,7 +26,7 @@ class PMA_StorageEngine_mrg_myisam extends PMA_StorageEngine_merge */ function getMysqlHelpPage() { - return 'merge'; + return 'merge-storage-engine'; } } diff --git a/libraries/engines/performance_schema.lib.php b/libraries/engines/performance_schema.lib.php new file mode 100644 index 0000000000..115deb033e --- /dev/null +++ b/libraries/engines/performance_schema.lib.php @@ -0,0 +1,28 @@ + diff --git a/test/engines/PMA_StorageEngine_innodb_test.php b/test/engines/PMA_StorageEngine_innodb_test.php index f84ecae8d8..ff4cd85e6a 100644 --- a/test/engines/PMA_StorageEngine_innodb_test.php +++ b/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() ); diff --git a/test/engines/PMA_StorageEngine_mrg_myisam_test.php b/test/engines/PMA_StorageEngine_mrg_myisam_test.php index 3c45557aac..de2fec6c1d 100644 --- a/test/engines/PMA_StorageEngine_mrg_myisam_test.php +++ b/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' ); } From 0426162e75262b77e2a62280e41e83387c41340e Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 3 Feb 2013 08:15:31 -0500 Subject: [PATCH 2/2] Fix typos --- libraries/StorageEngine.class.php | 2 +- libraries/engines/bdb.lib.php | 2 +- libraries/engines/binlog.lib.php | 2 +- libraries/engines/innodb.lib.php | 2 +- libraries/engines/mrg_myisam.lib.php | 2 +- libraries/engines/performance_schema.lib.php | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/StorageEngine.class.php b/libraries/StorageEngine.class.php index 1d63860f1d..2dfe7f7ef1 100644 --- a/libraries/StorageEngine.class.php +++ b/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 */ diff --git a/libraries/engines/bdb.lib.php b/libraries/engines/bdb.lib.php index a62bdfd28b..91a56bb57f 100644 --- a/libraries/engines/bdb.lib.php +++ b/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 */ diff --git a/libraries/engines/binlog.lib.php b/libraries/engines/binlog.lib.php index 18f1badcf0..ea81738967 100644 --- a/libraries/engines/binlog.lib.php +++ b/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 */ diff --git a/libraries/engines/innodb.lib.php b/libraries/engines/innodb.lib.php index a2afe440af..b0eec39ce3 100644 --- a/libraries/engines/innodb.lib.php +++ b/libraries/engines/innodb.lib.php @@ -347,7 +347,7 @@ 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 */ diff --git a/libraries/engines/mrg_myisam.lib.php b/libraries/engines/mrg_myisam.lib.php index 27d585debd..d3425365c2 100644 --- a/libraries/engines/mrg_myisam.lib.php +++ b/libraries/engines/mrg_myisam.lib.php @@ -20,7 +20,7 @@ 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 */ diff --git a/libraries/engines/performance_schema.lib.php b/libraries/engines/performance_schema.lib.php index 115deb033e..f7664b6558 100644 --- a/libraries/engines/performance_schema.lib.php +++ b/libraries/engines/performance_schema.lib.php @@ -15,7 +15,7 @@ class PMA_StorageEngine_performance_schema extends PMA_StorageEngine { /** * returns string with filename for the MySQL helppage - * about this storage engne + * about this storage engine * * @return string mysql helppage filename */