[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-2981-g47528c2

Marc Delisle lem9 at users.sourceforge.net
Sun Jun 5 13:03:09 CEST 2011


The branch, master has been updated
       via  47528c2048d2f8cccb0fbe7477a87960211edcc9 (commit)
       via  4294f8ea418c034706c7d028267e9b1517815fa5 (commit)
      from  1e0cff6161ba0fe675c47e94617b492fa155d089 (commit)


- Log -----------------------------------------------------------------
commit 47528c2048d2f8cccb0fbe7477a87960211edcc9
Author: Marc Delisle <marc at infomarc.info>
Date:   Sun Jun 5 07:02:19 2011 -0400

    Document DisableMultiTableMaintenance

commit 4294f8ea418c034706c7d028267e9b1517815fa5
Author: Gábor Kövesdán <gaborkovesdan at users.sourceforge.net>
Date:   Sun Jun 5 06:53:34 2011 -0400

    patch #3271804 New DisableMultiTableMaintenance directive

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                    |    1 +
 Documentation.html           |    9 +++++++++
 db_structure.php             |    2 +-
 libraries/config.default.php |    7 +++++++
 4 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 54e05d3..014bc49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@
 + AJAX for Create table in navigation panel
 + rfe #3310562 Wording about Column
 + AJAX for Add a user in Database privileges
++ Patch #3271804 for rfe #3177495, new DisableMultiTableMaintenance directive
 
 3.4.3.0 (not yet released)
 - bug #3311170 [sync] Missing helper icons in Synchronize
diff --git a/Documentation.html b/Documentation.html
index ed6a5ca..6e98747 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -1845,6 +1845,15 @@ $cfg['TrustedProxies'] =
     Default is <code>1000</code>.
     </dd>
 
+    <dt
+    id="cfg_DisableMultiTableMaintenance">$cfg['DisableMultiTableMaintenance'] boolean</dt>
+    <dd>
+    In the database Structure page, it's possible to mark some tables then
+    choose an operation like optimizing for many tables. This can slow down
+    a server; therefore, setting this to <code>true</code> prevents this kind
+    of multiple maintenance operation. Default is <code>false</code>.
+    </dd>
+
     <dt id="cfg_NaviWidth">$cfg['NaviWidth'] integer</dt>
     <dd>Navi frame width in pixels. See <tt>themes/themename/layout.inc.php</tt>.
     </dd>
diff --git a/db_structure.php b/db_structure.php
index ebc6915..6d301d5 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -504,7 +504,7 @@ echo '    <option value="export" >'
 echo '    <option value="print" >'
     . __('Print view') . '</option>' . "\n";
 
-if (!$db_is_information_schema) {
+if (!$db_is_information_schema && !$cfg['DisableMultiTableMaintenance']) {
     echo '    <option value="empty_tbl" >'
          . __('Empty') . '</option>' . "\n";
     echo '    <option value="drop_tbl" >'
diff --git a/libraries/config.default.php b/libraries/config.default.php
index c804dcc..ad1d9ac 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -2621,6 +2621,13 @@ $cfg['CheckConfigurationPermissions'] = true;
  */
 $cfg['LinkLengthLimit'] = 2000;
 
+/**
+ * Disable the table maintenance mass operations, like optimizing or
+ * repairing the selected tables of a database. An accidental execution
+ * of such a maintenance task can enormously slow down a bigger database.
+ */
+$cfg['DisableMultiTableMaintenance'] = false;
+
 /*******************************************************************************
  * SQL Parser Settings
  *


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list