Permalink
Browse files

Merge pull request #2524 from JonathonMA/fix_ecd37084b28a05f05251

Use mysql_creation_options inside rescue block
  • Loading branch information...
spastorino committed Aug 22, 2011
1 parent 0ebdef2 commit c8ec8f78d3e26f4f179112b10be445748d93a3e4
Showing with 1 addition and 1 deletion.
  1. +1 −1 activerecord/lib/active_record/railties/databases.rake
@@ -85,7 +85,7 @@ 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

0 comments on commit c8ec8f7

Please sign in to comment.