diff options
author | Dries Buytaert <dries@buytaert.net> | 2008-10-06 10:54:15 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2008-10-06 10:54:15 +0000 |
commit | c462ab100274487d934f9c81759c9035f50a05d6 (patch) | |
tree | 254573124d6defef182db359ea92a2c8ef309315 /sites/default | |
parent | f0979758ad4630a3230f381b2355cc8d82ef4d3f (diff) | |
download | brdo-c462ab100274487d934f9c81759c9035f50a05d6.tar.gz brdo-c462ab100274487d934f9c81759c9035f50a05d6.tar.bz2 |
- Patch #299661 by smk-ka, oadaeh, et al: install.php does not correctly check database settings.
Diffstat (limited to 'sites/default')
-rw-r--r-- | sites/default/default.settings.php | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php index 7659fd3b2..758f52b89 100644 --- a/sites/default/default.settings.php +++ b/sites/default/default.settings.php @@ -60,6 +60,7 @@ * 'username' => 'username', * 'password' => 'password', * 'host' => 'localhost', + * 'port' => 3306, * ); * * The "driver" property indicates what Drupal database driver the @@ -87,28 +88,17 @@ * $databases['default']['default'] = $info_array; * $databases['default']['slave'][] = $info_array; * $databases['default']['slave'][] = $info_array; - * $databases['extra'] = $info_array; + * $databases['extra']['default'] = $info_array; * * In the above example, $info_array is an array of settings described above. * The first line sets a "default" database that has one master database * (the second level default). The second and third lines create an array * of potential slave databases. Drupal will select one at random for a given * request as needed. The fourth line creates a new database with a name of - * "extra". Since no target is specified, it is assumed to be "default", that - * is, only one server. + * "extra". * * For a single database configuration, the following is sufficient: * - * $databases = array( - * 'driver' => 'mysql', - * 'database' => 'databasename', - * 'username' => 'username', - * 'password' => 'password', - * 'host' => 'localhost', - * ); - * - * That is equivalent to: - * * $databases['default']['default'] = array( * 'driver' => 'mysql', * 'database' => 'databasename', @@ -141,21 +131,21 @@ * ); * * Database configuration format: - * $databases = array( + * $databases['default']['default'] = array( * 'driver' => 'mysql', * 'database' => 'databasename', * 'username' => 'username', * 'password' => 'password', * 'host' => 'localhost', * ); - * $databases = array( + * $databases['default']['default'] = array( * 'driver' => 'pgsql', * 'database' => 'databasename', * 'username' => 'username', * 'password' => 'password', * 'host' => 'localhost', * ); - * $databases = array( + * $databases['default']['default'] = array( * 'driver' => 'sqlite', * 'database' => 'databasefilename', * ); |