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

bug 968089, catch when server is not responding

Browse Source
This commit is contained in:
Marc Delisle
2004-06-10 14:19:23 +00:00
parent 478fccda5e
commit edf1b10063
2 changed files with 36 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -5,6 +5,13 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2004-06-10 Marc Delisle <lem9@users.sourceforge.net>
* libraries/auth/config.auth.lib.php, libraries/dbi/mysql.dbi.lib.php,
lang/*: bug 968089: catch error when server is not responding
and show an appropriate message
TODO: for mysqli
2004-06-09 Alexander M. Turek <me@derrabus.de> 2004-06-09 Alexander M. Turek <me@derrabus.de>
### 2.5.7 released from MAINT_2_5 branch. ### 2.5.7 released from MAINT_2_5 branch.

32
libraries/dbi/mysql.dbi.lib.php
View File

@@ -182,18 +182,40 @@ function PMA_DBI_free_result($result) {
} }
function PMA_DBI_getError($link = NULL) { function PMA_DBI_getError($link = NULL) {
unset($GLOBALS['errno']);
if (empty($link)) { if (empty($link)) {
if (isset($GLOBALS['userlink'])) { if (isset($GLOBALS['userlink'])) {
$link = $GLOBALS['userlink']; $link = $GLOBALS['userlink'];
// Do not stop now. On the initial connection, we don't have a $link,
// we don't have a $GLOBALS['userlink'], but we can catch the error code
// } else {
// return FALSE;
}
}
if (mysql_errno()) {
$error = mysql_errno();
$error_message = mysql_error();
} else {
$error = mysql_errno($link);
$error_message = mysql_error($link);
}
// keep the error number for further check after the call to PMA_DBI_getError()
if ($error) {
$GLOBALS['errno'] = $error;
} else { } else {
return FALSE; return FALSE;
} }
}
$error = mysql_errno($link); // Some errors messages cannot be obtained by mysql_error()
if ($error && PMA_MYSQL_INT_VERSION >= 40100) { if ($error && $error == 2003) {
$error = '#' . ((string) $error) . ' - ' . mysql_error($link); $error = '#' . ((string) $error) . ' - ' . $GLOBALS['strServerNotResponding'];
} elseif ($error && PMA_MYSQL_INT_VERSION >= 40100) {
$error = '#' . ((string) $error) . ' - ' . $error_message;
} elseif ($error) { } elseif ($error) {
$error = '#' . ((string) $error) . ' - ' . PMA_convert_display_charset(mysql_error($link)); $error = '#' . ((string) $error) . ' - ' . PMA_convert_display_charset($error_message);
} }
return $error; return $error;
} }