[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2-4435-gd9304ef

Rouslan Placella roccivic at users.sourceforge.net
Tue Jun 21 00:17:54 CEST 2011


The branch, master has been updated
       via  d9304efed4efb23af5b9452f5250dbda87624bda (commit)
       via  387cb5c1fe09b423f70688bd73a65f69063372c7 (commit)
       via  a5408b248b727cc1f6e98860760a401413fed4a7 (commit)
      from  cf3930d29ff507a57a6aaa986a4a11391573f8a1 (commit)


- Log -----------------------------------------------------------------
commit d9304efed4efb23af5b9452f5250dbda87624bda
Merge: 387cb5c1fe09b423f70688bd73a65f69063372c7 cf3930d29ff507a57a6aaa986a4a11391573f8a1
Author: Rouslan Placella <rouslan at placella.com>
Date:   Mon Jun 20 23:16:27 2011 +0100

    Merge remote-tracking branch 'origin/master'

commit 387cb5c1fe09b423f70688bd73a65f69063372c7
Author: Rouslan Placella <rouslan at placella.com>
Date:   Mon Jun 20 23:16:12 2011 +0100

    Temporarily hiding links to unfinished implementations of Triggers and Events functionalities

commit a5408b248b727cc1f6e98860760a401413fed4a7
Author: Rouslan Placella <rouslan at placella.com>
Date:   Mon Jun 20 23:11:48 2011 +0100

    Updated the changeLog - Improved support for routines

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

Summary of changes:
 ChangeLog                   |    1 +
 libraries/db_links.inc.php  |    6 ++++--
 libraries/tbl_links.inc.php |    7 ++++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f9594ca..62a3329 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,7 @@ phpMyAdmin - ChangeLog
 + AJAX for Insert to a table from database Structure page
 - Patch #3316969 PMA_ajaxShowMessage() does not respect timeout
 + AJAX for Change on multiple rows in table Browse
++ [interface] Improved support for stored routines
 
 3.4.4.0 (not yet released)
 
diff --git a/libraries/db_links.inc.php b/libraries/db_links.inc.php
index cb276d5..d1579e9 100644
--- a/libraries/db_links.inc.php
+++ b/libraries/db_links.inc.php
@@ -125,10 +125,12 @@ if (! $db_is_information_schema) {
         $tabs[] =& $tab_routines;
     }
     if (PMA_MYSQL_INT_VERSION >= 50106 && ! PMA_DRIZZLE) {
-        $tabs[] =& $tab_events;
+        // Temporarily hiding this unfinished feature
+        // $tabs[] =& $tab_events;
     }
     if (PMA_MYSQL_INT_VERSION >= 50002 && ! PMA_DRIZZLE) {
-        $tabs[] =& $tab_triggers;
+        // Temporarily hiding this unfinished feature
+        // $tabs[] =& $tab_triggers;
     }
 }
 if (PMA_Tracker::isActive()) {
diff --git a/libraries/tbl_links.inc.php b/libraries/tbl_links.inc.php
index 66df327..6282097 100644
--- a/libraries/tbl_links.inc.php
+++ b/libraries/tbl_links.inc.php
@@ -98,9 +98,10 @@ if(PMA_Tracker::isActive()) {
     $tabs['tracking']['link'] = 'tbl_tracking.php';
 }
 if (! $db_is_information_schema && PMA_MYSQL_INT_VERSION >= 50002 && ! PMA_DRIZZLE) {
-    $tabs['triggers']['link'] = 'tbl_triggers.php';
-    $tabs['triggers']['text'] = __('Triggers');
-    $tabs['triggers']['icon'] = 'b_triggers.png';
+    // Temporarily hiding this unfinished feature
+    // $tabs['triggers']['link'] = 'tbl_triggers.php';
+    // $tabs['triggers']['text'] = __('Triggers');
+    // $tabs['triggers']['icon'] = 'b_triggers.png';
 }
 
 /**


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list