---- phpMyAdmin-2.5.5/config.inc.php~ 2003-12-29 01:02:27.000000000 +0100
-+++ phpMyAdmin-2.5.5/config.inc.php 2003-12-29 01:02:55.000000000 +0100
-@@ -79,7 +79,7 @@
+diff -ur phpMyAdmin.orig/config.default.php phpMyAdmin/config.default.php
+--- phpMyAdmin.orig/config.default.php 2005-11-23 11:34:32.000000000 +0100
++++ phpMyAdmin/config.default.php 2005-12-19 21:02:34.565280520 +0100
+@@ -1,8 +1,6 @@
+ <?php
+
+-/* !!! DO NOT EDIT THIS FILE, EDIT config.inc.php INSTEAD !!! */
+-
+-/* $Id$ */
++/* $Id$ */
+ // vim: expandtab sw=4 ts=4 sts=4:
+
+ /**
+@@ -68,8 +66,8 @@
// The controluser is also
// used for all relational
// features (pmadb)
-$cfg['Servers'][$i]['auth_type'] = 'config'; // Authentication method (config, http or cookie based)?
+-$cfg['Servers'][$i]['user'] = 'root'; // MySQL user
+$cfg['Servers'][$i]['auth_type'] = 'cookie'; // Authentication method (config, http or cookie based)?
- $cfg['Servers'][$i]['user'] = 'root'; // MySQL user
++$cfg['Servers'][$i]['user'] = 'mysql'; // MySQL user
$cfg['Servers'][$i]['password'] = ''; // MySQL password (only needed
// with 'config' auth_type)
+ $cfg['Servers'][$i]['only_db'] = ''; // If set to a db-name, only