diff options
| author | Sven Fuchs <svenfuchs@artweb-design.de> | 2008-08-25 11:11:08 +0200 |
|---|---|---|
| committer | Sven Fuchs <svenfuchs@artweb-design.de> | 2008-08-25 11:11:08 +0200 |
| commit | e464f9b6b93daa847a7d6fa1c3af63c8cef3f3e2 (patch) | |
| tree | 6fcd3b1a2c30a2c25b85915af5a4277765f26858 /railties/lib/commands/dbconsole.rb | |
| parent | 90a9637d41016c0d230ba36657e83a4f8d54cc46 (diff) | |
| parent | fb20d6f09d5e91280bf2b5888a7299b50dba7a7b (diff) | |
| download | rails-e464f9b6b93daa847a7d6fa1c3af63c8cef3f3e2.tar.gz rails-e464f9b6b93daa847a7d6fa1c3af63c8cef3f3e2.tar.bz2 rails-e464f9b6b93daa847a7d6fa1c3af63c8cef3f3e2.zip | |
Merge commit 'rails/master' into i18n
Diffstat (limited to 'railties/lib/commands/dbconsole.rb')
| -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"] |