---- 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 @@
- // 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]['auth_type'] = 'cookie'; // Authentication method (config, http or cookie based)?
- $cfg['Servers'][$i]['user'] = 'root'; // MySQL user
- $cfg['Servers'][$i]['password'] = ''; // MySQL password (only needed
- // with 'config' auth_type)
+diff -burNp phpMyAdmin-3.1.0-all-languages/libraries/config.default.php phpMyAdmin-3.1.0-all-languages-new/libraries/config.default.php
+--- phpMyAdmin-3.1.0-all-languages/libraries/config.default.php 2008-11-28 14:21:00.000000000 +0100
++++ phpMyAdmin-3.1.0-all-languages-new/libraries/config.default.php 2008-12-02 10:31:40.200149063 +0100
+@@ -180,7 +180,7 @@ $cfg['Servers'][$i]['auth_swekey_config'
+ *
+ * @global string $cfg['Servers'][$i]['user']
+ */
+-$cfg['Servers'][$i]['user'] = 'root';
++$cfg['Servers'][$i]['user'] = 'mysql';
+
+ /**
+ * MySQL password (only needed with 'config' auth_type)