[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-2063-geeeca22

[Marc Delisle]

The branch, master has been updated
       via  eeeca229de40bd4599ebc84aa0b219ca174537c5 (commit)
      from  7d8be177ef55d867c567dec3c78b80af406fae65 (commit)


- Log -----------------------------------------------------------------
commit eeeca229de40bd4599ebc84aa0b219ca174537c5
Author: Marc Delisle <marc at infomarc.info>
Date:   Sat May 28 08:23:56 2011 -0400

    Undefined variable when query is too big

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

Summary of changes:
 libraries/common.lib.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 538d8ac..f0d174f 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1094,6 +1094,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
         // but only explain a SELECT (that has not been explained)
         /* SQL-Parser-Analyzer */
         $explain_link = '';
+        $is_select = false;
         if (! empty($cfg['SQLQuery']['Explain']) && ! $query_too_big) {
             $explain_params = $url_params;
             // Detect if we are validating as well
@@ -1101,7 +1102,6 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
             if (! empty($GLOBALS['validatequery'])) {
                 $explain_params['validatequery'] = 1;
             }
-            $is_select = false;
             if (preg_match('@^SELECT[[:space:]]+ at i', $sql_query)) {
                 $explain_params['sql_query'] = 'EXPLAIN ' . $sql_query;
                 $_message = __('Explain SQL');


hooks/post-receive
-- 
phpMyAdmin