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

use PMA_DBI_try_query to catch the error

Browse Source
This commit is contained in:
Marc Delisle
2004-07-07 17:02:53 +00:00
parent ec7e4357de
commit ce969cb209
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -9,6 +9,8 @@ $Source$
* main.php: bug 984136, wrong alignment in RTL languages * main.php: bug 984136, wrong alignment in RTL languages
* lang/arabic-utf-8, lang/sync_lang.sh: bug 984176, wrong encoding * lang/arabic-utf-8, lang/sync_lang.sh: bug 984176, wrong encoding
for arabic UTF-8. sync with --iconv works. for arabic UTF-8. sync with --iconv works.
* tbl_relation.php: use PMA_DBI_try_query() to be able to catch the
missing index error (InnoDB) and give appropriate advice
2004-07-06 Marc Delisle <lem9@users.sourceforge.net> 2004-07-06 Marc Delisle <lem9@users.sourceforge.net>
* libraries/export/xls.php: enable user to specify './tmp' as the * libraries/export/xls.php: enable user to specify './tmp' as the

2
tbl_relation.php
View File

@@ -189,7 +189,7 @@ if (isset($submit_rel) && $submit_rel == 'true') {
} // end if... else.... } // end if... else....
if (isset($upd_query)) { if (isset($upd_query)) {
$upd_rs = PMA_DBI_query($upd_query); $upd_rs = PMA_DBI_try_query($upd_query);
if (substr(PMA_DBI_getError(), 1, 4) == '1005') { if (substr(PMA_DBI_getError(), 1, 4) == '1005') {
echo '<p class="warning">' . $strNoIndex . ' (' . $master_field .')</p>' . PMA_showMySQLDocu('manual_Table_types', 'InnoDB_foreign_key_constraints') . "\n"; echo '<p class="warning">' . $strNoIndex . ' (' . $master_field .')</p>' . PMA_showMySQLDocu('manual_Table_types', 'InnoDB_foreign_key_constraints') . "\n";
} }