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

bug #1103201

Browse Source
This commit is contained in:
Marc Delisle
2005-01-16 14:41:27 +00:00
parent 11bdb47d57
commit 6a863ea364
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2005-01-16 Marc Delisle <lem9@users.sourceforge.net>
* libraries/common.lib.php: bug #1103201, wrong treatment of MySQL error
#1060 in the logic for error #1062
2005-01-15 Alexander M. Turek <me@derrabus.de> 2005-01-15 Alexander M. Turek <me@derrabus.de>
* server_links.inc.php, server_engines.php, lang/*.inc.php, * server_links.inc.php, server_engines.php, lang/*.inc.php,
libraries/storage_engines.php: Detailed storage engines status libraries/storage_engines.php: Detailed storage engines status

5
libraries/common.lib.php
View File

@@ -672,7 +672,10 @@ if ($is_minimum_common == FALSE) {
// feature request #1036254: // feature request #1036254:
// Add a link by MySQL-Error #1062 - Duplicate entry // Add a link by MySQL-Error #1062 - Duplicate entry
// 2004-10-20 by mk.keck // 2004-10-20 by mk.keck
if (strstr($tmp_mysql_error,"duplicate")) { if (substr($error_message, 1, 4) == '1062') {
// TODO: do not assume that the error message is in English
// and do not use mysql_result()
// explode the entry and the column // explode the entry and the column
$arr_mysql_val_key = explode('entry \'',$tmp_mysql_error); $arr_mysql_val_key = explode('entry \'',$tmp_mysql_error);
$arr_mysql_val_key = explode('\' for key',$arr_mysql_val_key[1]); $arr_mysql_val_key = explode('\' for key',$arr_mysql_val_key[1]);