---- 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 @@
+--- libraries/config.default.php.orig 2006-11-01 14:34:05.000000000 +0100
++++ libraries/config.default.php 2006-11-01 17:53:18.000000000 +0100
+@@ -2,7 +2,7 @@
+
+ /* !!! DO NOT EDIT THIS FILE, EDIT config.inc.php INSTEAD !!! */
+
+-/* $Id$ */
++/* $Id$ */
+ // vim: expandtab sw=4 ts=4 sts=4:
+
+ /**
+@@ -68,8 +68,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]['nopassword'] = FALSE; // Whether to try to connect without password