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

Name of column is sometimes Default (bug #798426).

Browse Source
This commit is contained in:
Michal Čihař
2003-09-01 11:32:39 +00:00
parent 3127edeba3
commit c04a4a6929
2 changed files with 5 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$
2003-09-01 Michal Cihar <nijel@users.sourceforge.net>
* libraries/mysql_charsets.lib.php3: Name of column is sometimes Default
(bug #798426).
2003-08-31 Marc Delisle <lem9@users.sourceforge.net> 2003-08-31 Marc Delisle <lem9@users.sourceforge.net>
* libraries/sqlparser.lib.php3: extract ON DELETE, ON UPDATE for FOREIGN KEYs * libraries/sqlparser.lib.php3: extract ON DELETE, ON UPDATE for FOREIGN KEYs
* libraries/relation.lib.php3: populate $foreign with ON DELETE, ON UPDATE * libraries/relation.lib.php3: populate $foreign with ON DELETE, ON UPDATE

2
libraries/mysql_charsets.lib.php3
View File

@@ -35,7 +35,7 @@ if (!defined('PMA_MYSQL_CHARSETS_LIB_INCLUDED')){
} else { } else {
$mysql_collations[$row['Charset']][] = $row['Collation']; $mysql_collations[$row['Charset']][] = $row['Collation'];
} }
if ($row['D'] == 'Y') { if ((isset($row['D']) && $row['D'] == 'Y') || (isset($row['Default']) && $row['Default'] == 'Yes')) {
$mysql_default_collations[$row['Charset']] = $row['Collation']; $mysql_default_collations[$row['Charset']] = $row['Collation'];
} }
} }