diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2011-08-22 10:36:12 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-08-22 10:36:12 -0700 |
| commit | 0942879a5278008cf1ba2c33f084ada1cbf91ff3 (patch) | |
| tree | 8c3f8dc2bd7d2d92cf194c0a22fd455c81e060ca /activerecord | |
| parent | cfb5e14f5d25520d1bf3fdbaa5a610d285752628 (diff) | |
| parent | 4bb7abcb7715c06ff816243c61d75b14afc117e0 (diff) | |
| download | rails-0942879a5278008cf1ba2c33f084ada1cbf91ff3.tar.gz rails-0942879a5278008cf1ba2c33f084ada1cbf91ff3.tar.bz2 rails-0942879a5278008cf1ba2c33f084ada1cbf91ff3.zip | |
Merge pull request #2524 from JonathonMA/fix_ecd37084b28a05f05251
Use mysql_creation_options inside rescue block
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 |