diff options
| author | Jonathon M. Abbott <jma@dandaraga.net> | 2011-07-27 17:35:35 +1000 |
|---|---|---|
| committer | Jonathon M. Abbott <jma@dandaraga.net> | 2011-08-14 22:09:42 +1000 |
| commit | 4bb7abcb7715c06ff816243c61d75b14afc117e0 (patch) | |
| tree | 6940be1513039fab76ecc7be049e5579c334b144 /activerecord | |
| parent | bf2b9d2de3f85e880e5afa980e6fd65b1f07557c (diff) | |
| download | rails-4bb7abcb7715c06ff816243c61d75b14afc117e0.tar.gz rails-4bb7abcb7715c06ff816243c61d75b14afc117e0.tar.bz2 rails-4bb7abcb7715c06ff816243c61d75b14afc117e0.zip | |
Use mysql_creation_options inside rescue block
Commit ecd37084b28a05f05251 did not take into account the use of
creation_options inside the access denied exception handler.
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/railties/databases.rake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake index ec00f7faad..13c41350fb 100644 --- a/activerecord/lib/active_record/railties/databases.rake +++ b/activerecord/lib/active_record/railties/databases.rake @@ -94,7 +94,7 @@ db_namespace = namespace :db do "IDENTIFIED BY '#{config['password']}' WITH GRANT OPTION;" ActiveRecord::Base.establish_connection(config.merge( 'database' => nil, 'username' => 'root', 'password' => root_password)) - ActiveRecord::Base.connection.create_database(config['database'], creation_options) + ActiveRecord::Base.connection.create_database(config['database'], mysql_creation_options(config)) ActiveRecord::Base.connection.execute grant_statement ActiveRecord::Base.establish_connection(config) else |