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

rfe #1913541 link to InnoDB status when error 1005 occurs

Browse Source
This commit is contained in:
Michal Čihař
2008-11-30 14:14:28 +00:00
parent 7676f7e1b5
commit ec305517f1
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -9,6 +9,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- [core] better support for vendor customisation (based on what Debian needs) - [core] better support for vendor customisation (based on what Debian needs)
- rfe #2127987 warn when session.gc_maxlifetime is less than cookie validity - rfe #2127987 warn when session.gc_maxlifetime is less than cookie validity
- rfe #2100910 configurable default charset for import - rfe #2100910 configurable default charset for import
- rfe #1913541 link to InnoDB status when error 1005 occurs
3.1.1.0 (not yet released) 3.1.1.0 (not yet released)
- patch #2242765 [core] Navi panel server links wrong, - patch #2242765 [core] Navi panel server links wrong,

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

@@ -272,9 +272,11 @@ function PMA_DBI_get_client_info()
* @uses $GLOBALS['userlink'] * @uses $GLOBALS['userlink']
* @uses $GLOBALS['strServerNotResponding'] * @uses $GLOBALS['strServerNotResponding']
* @uses $GLOBALS['strSocketProblem'] * @uses $GLOBALS['strSocketProblem']
* @uses $GLOBALS['strDetails']
* @uses mysql_errno() * @uses mysql_errno()
* @uses mysql_error() * @uses mysql_error()
* @uses defined() * @uses defined()
* @uses PMA_generate_common_url()
* @param resource $link mysql link * @param resource $link mysql link
* @return string|boolean $error or false * @return string|boolean $error or false
*/ */
@@ -313,6 +315,13 @@ function PMA_DBI_getError($link = null)
$error = '#' . ((string) $error_number) . ' - ' . $GLOBALS['strServerNotResponding'] . ' ' . $GLOBALS['strSocketProblem']; $error = '#' . ((string) $error_number) . ' - ' . $GLOBALS['strServerNotResponding'] . ' ' . $GLOBALS['strSocketProblem'];
} elseif ($error_number == 2003) { } elseif ($error_number == 2003) {
$error = '#' . ((string) $error_number) . ' - ' . $GLOBALS['strServerNotResponding']; $error = '#' . ((string) $error_number) . ' - ' . $GLOBALS['strServerNotResponding'];
} elseif ($error_number == 1005) {
/* InnoDB contraints, see
* http://dev.mysql.com/doc/refman/5.0/en/innodb-foreign-key-constraints.html
*/
$error = '#' . ((string) $error_number) . ' - ' . $error_message .
' (<a href="server_engines.php' . PMA_generate_common_url(array('engine' => 'InnoDB', 'page' => 'Status')).
'">' . $GLOBALS['strDetails'] . '</a>)';
} else { } else {
$error = '#' . ((string) $error_number) . ' - ' . $error_message; $error = '#' . ((string) $error_number) . ' - ' . $error_message;
} }