diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-08-24 11:08:25 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-08-24 11:08:25 -0700 |
| commit | 3c52c4c12bb08321a2e10974ec281e03b9f8d539 (patch) | |
| tree | 696616cfe7f5b6a523deec44bbc171a1658f8f3c /railties/lib | |
| parent | bb3dd6ad2e5f823b21fc02dcc5b23aa5d4bf6465 (diff) | |
| parent | 337b043c9373014b034b79c487f70594ebb6a910 (diff) | |
| download | rails-3c52c4c12bb08321a2e10974ec281e03b9f8d539.tar.gz rails-3c52c4c12bb08321a2e10974ec281e03b9f8d539.tar.bz2 rails-3c52c4c12bb08321a2e10974ec281e03b9f8d539.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/commands/dbconsole.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/commands/dbconsole.rb b/railties/lib/commands/dbconsole.rb index 442526ae32..5be3b5dd8e 100644 --- a/railties/lib/commands/dbconsole.rb +++ b/railties/lib/commands/dbconsole.rb @@ -47,7 +47,7 @@ when "mysql" args << config['database'] - exec(find_cmd('mysql5', 'mysql'), *args) + exec(find_cmd('mysql', 'mysql5'), *args) when "postgresql" ENV['PGUSER'] = config["username"] if config["username"] |