---- libraries/config.default.php 2007-01-10 03:24:01.000000000 +0100
-+++ libraries/config.default.php-new 2007-01-10 03:25:52.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:
+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';
/**
-@@ -68,8 +68,8 @@
- // The controluser is also
- // used for all relational
- // features (pmadb)
--$cfg['Servers'][$i]['auth_type'] = 'config'; // Authentication method (valid choices: config, http, HTTP or cookie)
--$cfg['Servers'][$i]['user'] = 'root'; // MySQL user
-+$cfg['Servers'][$i]['auth_type'] = 'cookie'; // Authentication method (valid choices: config, http, HTTP or cookie)
-+$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
+ * MySQL password (only needed with 'config' auth_type)