[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5336-gce2cad2

[Marc Delisle]

The branch, master has been updated
       via  ce2cad288666f2bfd71dc21ae8e0277288834657 (commit)
       via  b55ba34d43138b11b71d8eeae6b09ea160ded213 (commit)
       via  b2616ac46ddbc72ee3a03f13ee4d4ec746518274 (commit)
      from  90ce4c77b38f5e51b35fea23125df861ed3bd1cc (commit)


- Log -----------------------------------------------------------------
commit ce2cad288666f2bfd71dc21ae8e0277288834657
Merge: 90ce4c77b38f5e51b35fea23125df861ed3bd1cc b55ba34d43138b11b71d8eeae6b09ea160ded213
Author: Marc Delisle <marc at infomarc.info>
Date:   Sun Jul 11 08:05:50 2010 -0400

    fix merge conflicts

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

Summary of changes:
 ChangeLog                   |    3 +++
 libraries/db_common.inc.php |   13 ++++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 867bebf..6373434 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -97,6 +97,9 @@ $Id$
 - bug #3024344 [setup] Setup forces numeric MemoryLimit
 - bug #3025975 [auth] Odd LoginCookieValidity default value
 - 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