aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-09-20 10:04:12 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-09-20 10:04:12 +0000
commita41619681f7bbf558989b377df8eb8987b694943 (patch)
tree8769bd2e25375cd09b0b417f043a76c56d08f13b /railties
parent7f26415d3c0e4101ce1569a499470e8a32dbfede (diff)
downloadrails-a41619681f7bbf558989b377df8eb8987b694943.tar.gz
rails-a41619681f7bbf558989b377df8eb8987b694943.tar.bz2
rails-a41619681f7bbf558989b377df8eb8987b694943.zip
Include suggestion for using different socket #1951 [NVRS]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2272 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
-rw-r--r--railties/configs/database.yml6
1 files changed, 4 insertions, 2 deletions
diff --git a/railties/configs/database.yml b/railties/configs/database.yml
index c9c8316dcb..e8977ea352 100644
--- a/railties/configs/database.yml
+++ b/railties/configs/database.yml
@@ -3,8 +3,10 @@ development:
database: rails_development
host: localhost
username: root
- password:
-
+ password:
+ # With the MySQL adapter on localhost, it defaults to /tmp/mysql.sock
+ # socket: /var/run/mysqld/mysqld.sock
+
# Warning: The database defined as 'test' will be erased and
# re-generated from your development database when you run 'rake'.
# Do not set this db to the same as development or production.