[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_4-22-gb55ba34 - Git

11 Jul 2010

The branch, QA_3_3 has been updated
       via  b55ba34d43138b11b71d8eeae6b09ea160ded213 (commit)
      from  b2616ac46ddbc72ee3a03f13ee4d4ec746518274 (commit)
- Log -----------------------------------------------------------------
commit b55ba34d43138b11b71d8eeae6b09ea160ded213
Author: Marc Delisle marc@infomarc.info
Date:   Sun Jul 11 08:00:42 2010 -0400
bug #3023507 [core] No result set display from stored procedure SELECT
-----------------------------------------------------------------------
Summary of changes:
 ChangeLog                   |    1 +
 libraries/db_common.inc.php |   13 ++++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fc0822b..de56291 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #3026400 [PHP] ereg functions are deprecated
 - bug #3027557 [PHP] split() deprecated in PHP 5.3 (backport fixes from
 master, todo: update PHP excel?)
+- bug #3023507 [core] No result set display from stored procedure SELECT
3.3.4.0 (2010-06-28)
 - bug #2996161 [import] properly escape import value
diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php
index 955e7c8..5d16995 100644
--- a/libraries/db_common.inc.php
+++ b/libraries/db_common.inc.php
@@ -37,12 +37,19 @@ $err_url   = $cfg['DefaultTabDatabase'] . '?' . PMA_generate_common_url($db);
  * Ensures the database exists (else move to the "parent" script) and displays
  * headers
  */
-if (!isset($is_db) || !$is_db) {
-    // Not a valid db name -> back to the welcome page
+if (! isset($is_db) || ! $is_db) {
     if (strlen($db)) {
         $is_db = PMA_DBI_select_db($db);
+        // This "Command out of sync" 2014 error may happen, for example
+        // after calling a MySQL procedure; at this point we can't select
+        // the db but it's not necessarily wrong
+        if (PMA_DBI_getError() && $GLOBALS['errno'] == 2014) {
+            $is_db = true;
+            unset($GLOBALS['errno']);
+        }
     }
-    if (! strlen($db) || !$is_db) {
+    // Not a valid db name -> back to the welcome page
+    if (! strlen($db) || ! $is_db) {
         PMA_sendHeaderLocation($cfg['PmaAbsoluteUri'] . 'main.php?' . PMA_generate_common_url('', '', '&') . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1');
         exit;
     }
hooks/post-receive
-- 
phpMyAdmin


    