summaryrefslogtreecommitdiff
blob: 016ff6a372e362dbe277d050cc1983d906b5aa97 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
--- phpMyAdmin-2.5.5/config.inc.php	2003-12-02 21:59:24.000000000 +0000
+++ phpMyAdmin/config.inc.php	2003-12-29 01:09:58.000000000 +0000
@@ -72,14 +72,15 @@
 $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).
                                                     // 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']     = '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)
@@ -88,29 +89,36 @@
                                                     // It may also be an array of db-names, where sorting order is relevant.
 $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