--- phpMyAdmin-2.5.0/config.inc.php	2003-05-11 11:10:28.000000000 +0100
+++ phpMyAdmin/config.inc.php	2003-05-12 22:18:44.000000000 +0100
@@ -66,11 +66,11 @@
 $cfg['Servers'][$i]['connect_type']  = 'tcp';       // How to connect to MySQL server ('tcp' or 'socket')
 $cfg['Servers'][$i]['compress']      = FALSE;       // Use compressed protocol for the MySQL connection
                                                     // (requires PHP >= 4.3.0)
-$cfg['Servers'][$i]['controluser']   = '';          // MySQL control user settings
+$cfg['Servers'][$i]['controluser']   = 'pma';       // MySQL control user settings
                                                     // (this user must have read-only
-$cfg['Servers'][$i]['controlpass']   = '';          // access to the "mysql/user"
+$cfg['Servers'][$i]['controlpass']   = '@pmapass@'; // access to the "mysql/user"
                                                     // and "mysql/db" tables)
-$cfg['Servers'][$i]['auth_type']     = 'config';    // Authentication method (config, http or cookie based)?
+$cfg['Servers'][$i]['auth_type']     = 'http';      // 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)
@@ -81,29 +81,29 @@
                                                     // of db-names
 $cfg['Servers'][$i]['verbose']       = '';          // Verbose name for this host - leave blank to show the hostname
 
-$cfg['Servers'][$i]['pmadb']         = '';          // Database used for Relation, Bookmark and PDF Features
+$cfg['Servers'][$i]['pmadb']         = 'pmadb';     // Database used for Relation, Bookmark and PDF Features
                                                     // (see scripts/create_tables.sql)
                                                     //   - leave blank for no support
                                                     //     DEFAULT: 'phpmyadmin'
-$cfg['Servers'][$i]['bookmarktable'] = '';          // Bookmark table
+$cfg['Servers'][$i]['bookmarktable'] = 'PMA_bookmark';// Bookmark table
                                                     //   - leave blank for no bookmark support
                                                     //     DEFAULT: 'PMA_bookmark'
-$cfg['Servers'][$i]['relation']      = '';          // table to describe the relation between links (see doc)
+$cfg['Servers'][$i]['relation']      = 'PMA_relation';// table to describe the relation between links (see doc)
                                                     //   - leave blank for no relation-links support
                                                     //     DEFAULT: 'PMA_relation'
-$cfg['Servers'][$i]['table_info']    = '';          // table to describe the display fields
+$cfg['Servers'][$i]['table_info']    = 'PMA_table_info';// table to describe the display fields
                                                     //   - leave blank for no display fields support
                                                     //     DEFAULT: 'PMA_table_info'
-$cfg['Servers'][$i]['table_coords']  = '';          // table to describe the tables position for the PDF schema
+$cfg['Servers'][$i]['table_coords']  = 'PMA_table_coords';// table to describe the tables position for the PDF schema
                                                     //   - leave blank for no PDF schema support
                                                     //     DEFAULT: 'PMA_table_coords'
-$cfg['Servers'][$i]['pdf_pages']     = '';          // table to describe pages of relationpdf
+$cfg['Servers'][$i]['pdf_pages']     = 'PMA_pdf_pages';// table to describe pages of relationpdf
                                                     //   - leave blank if you don't want to use this
                                                     //     DEFAULT: 'PMA_pdf_pages'
-$cfg['Servers'][$i]['column_info']   = '';          // table to store column information
+$cfg['Servers'][$i]['column_info']   = 'PMA_column_info';// table to store column information
                                                     //   - leave blank for no column comments/mime types
                                                     //     DEFAULT: 'PMA_column_info'
-$cfg['Servers'][$i]['history']       = '';          // table to store SQL history
+$cfg['Servers'][$i]['history']       = 'PMA_history';// table to store SQL history
                                                     //   - leave blank for no SQL query history
                                                     //     DEFAULT: 'PMA_history'
 $cfg['Servers'][$i]['verbose_check'] = TRUE;        // set to FALSE if you know that your PMA_* tables