Merge remote-tracking branch 'upstream/master'

ibennetch · ibennetch · commit 5a4af02291dd · 2016-04-29T08:31:16.000-04:00
diff --git a/ChangeLog b/ChangeLog
@@ -39,6 +39,7 @@ phpMyAdmin - ChangeLog
 - issue #12144 Fixed parsing of some AS clauses
 - issue #12205 Fixed parsing of FULL OUTER JOIN queries
 - issue #12171 Fixed editing of VIEW structure
+- issue #12208 Avoid printing executed queries on import
 
 4.6.0.0 (2016-03-22)
 + issue #11456 Disabled storage engines
diff --git a/doc/config.rst b/doc/config.rst
@@ -2962,6 +2962,14 @@ Developer
     Enable logging queries and execution times to be
     displayed in the console's Debug SQL tab.
 
+.. config:option:: $cfg['DBG']['sqllog']
+
+    :type: boolean
+    :default: false
+
+    Enable logging of queries and execution times to the syslog.
+    Requires :config:option:`$cfg['DBG']['sql']` to be enabled.
+
 .. config:option:: $cfg['DBG']['demo']
 
     :type: boolean
diff --git a/libraries/DatabaseInterface.php b/libraries/DatabaseInterface.php
@@ -235,7 +235,7 @@ private function _dbgQuery($query, $link, $result, $time)
     public function tryQuery($query, $link = null, $options = 0,
         $cache_affected_rows = true
     ) {
-        $debug = isset($GLOBALS['cfg']['DBG']['sql']) && $GLOBALS['cfg']['DBG']['sql'];
+        $debug = $GLOBALS['cfg']['DBG']['sql'];
         $link = $this->getLink($link);
         if ($link === false) {
             return false;
@@ -254,7 +254,14 @@ public function tryQuery($query, $link = null, $options = 0,
         if ($debug) {
             $time = microtime(true) - $time;
             $this->_dbgQuery($query, $link, $result, $time);
-            syslog(LOG_WARNING, 'SQL: ' . sprintf('%0.3f', $time) . ' > ' . $query);
+            if ($GLOBALS['cfg']['DBG']['sqllog']) {
+                openlog('phpMyAdmin', LOG_NDELAY | LOG_PID, LOG_USER);
+                syslog(
+                    LOG_INFO,
+                    'SQL[' . basename($_SERVER['SCRIPT_NAME']) . ']: '
+                    . sprintf('%0.3f', $time) . ' > ' . $query
+                );
+            }
         }
 
         if ((!empty($result)) && (Tracker::isActive())) {
diff --git a/libraries/Menu.php b/libraries/Menu.php
@@ -127,6 +127,10 @@ private function _getMenu()
      */
     private function _getAllowedTabs($level)
     {
+        $cache_key = 'menu-levels-' . $level;
+        if (Util::cacheExists($cache_key)) {
+            return Util::cacheGet($cache_key);
+        }
         $allowedTabs = Util::getMenuTabList($level);
         $cfgRelation = PMA_getRelationsParam();
         if ($cfgRelation['menuswork']) {
@@ -154,6 +158,7 @@ private function _getAllowedTabs($level)
                 }
             }
         }
+        Util::cacheSet($cache_key, $allowedTabs);
         return $allowedTabs;
     }
 
diff --git a/libraries/config.default.php b/libraries/config.default.php
@@ -3071,6 +3071,13 @@
  */
 $cfg['DBG']['sql'] = false;
 
+/**
+ * Log executed queries and their execution times to syslog
+ *
+ * @global boolean $cfg['DBG']['sql']
+ */
+$cfg['DBG']['sqllog'] = false;
+
 /**
  * Enable to let server present itself as demo server.
  *
diff --git a/po/zh_TW.po b/po/zh_TW.po

Original file line number	Diff line number	Diff line change
`@@ -127,6 +127,10 @@ private function _getMenu()`
`127`	`127`	`*/`
`128`	`128`	`private function _getAllowedTabs($level)`
`129`	`129`	`{`
	`130`	`+ $cache_key = 'menu-levels-' . $level;`
	`131`	`+ if (Util::cacheExists($cache_key)) {`
	`132`	`+ return Util::cacheGet($cache_key);`
	`133`	`+ }`
`130`	`134`	`$allowedTabs = Util::getMenuTabList($level);`
`131`	`135`	`$cfgRelation = PMA_getRelationsParam();`
`132`	`136`	`if ($cfgRelation['menuswork']) {`
`@@ -154,6 +158,7 @@ private function _getAllowedTabs($level)`
`154`	`158`	`}`
`155`	`159`	`}`
`156`	`160`	`}`
	`161`	`+ Util::cacheSet($cache_key, $allowedTabs);`
`157`	`162`	`return $allowedTabs;`
`158`	`163`	`}`
`159`	`164`