From c04a4a6929afa9eaf7d762148f99f86bb0a65dd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Mon, 1 Sep 2003 11:32:39 +0000
Subject: [PATCH] Name of column is sometimes Default (bug #798426).

---
 ChangeLog                         | 4 ++++
 libraries/mysql_charsets.lib.php3 | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 593f9f4d2..6c5f920e7 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $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>
     * libraries/sqlparser.lib.php3: extract ON DELETE, ON UPDATE for FOREIGN KEYs
     * libraries/relation.lib.php3: populate $foreign with ON DELETE, ON UPDATE
diff --git a/libraries/mysql_charsets.lib.php3 b/libraries/mysql_charsets.lib.php3
index 6c6f266bf..c08519012 100644
--- a/libraries/mysql_charsets.lib.php3
+++ b/libraries/mysql_charsets.lib.php3
@@ -35,7 +35,7 @@ if (!defined('PMA_MYSQL_CHARSETS_LIB_INCLUDED')){
         } else {
             $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'];
         }
     }