nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug #3023507 [core] No result set display from stored procedure SELECT

Browse Source
This commit is contained in:
Marc Delisle
2010-07-11 08:00:42 -04:00
parent b2616ac46d
commit b55ba34d43
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -17,6 +17,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- bug #3026400 [PHP] ereg functions are deprecated - bug #3026400 [PHP] ereg functions are deprecated
- bug #3027557 [PHP] split() deprecated in PHP 5.3 (backport fixes from - bug #3027557 [PHP] split() deprecated in PHP 5.3 (backport fixes from
master, todo: update PHP excel?) master, todo: update PHP excel?)
- bug #3023507 [core] No result set display from stored procedure SELECT
3.3.4.0 (2010-06-28) 3.3.4.0 (2010-06-28)
- bug #2996161 [import] properly escape import value - bug #2996161 [import] properly escape import value

13
libraries/db_common.inc.php
View File

@@ -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 * Ensures the database exists (else move to the "parent" script) and displays
* headers * headers
*/ */
if (!isset($is_db) || !$is_db) { if (! isset($is_db) || ! $is_db) {
// Not a valid db name -> back to the welcome page
if (strlen($db)) { if (strlen($db)) {
$is_db = PMA_DBI_select_db($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'); PMA_sendHeaderLocation($cfg['PmaAbsoluteUri'] . 'main.php?' . PMA_generate_common_url('', '', '&') . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1');
exit; exit;
} }