diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-11-13 20:11:47 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-13 20:11:47 -0500 |
| commit | c163d93f948136d52195c644aa7bb23ec9795b38 (patch) | |
| tree | f5da377fd52ccf3e56c4b3aeaee765c2380915ab /activerecord/lib/active_record | |
| parent | 087921af292dbbfcaab4dc716f0f449a9f251957 (diff) | |
| parent | 8be9c710f612cac7f2121b8f829ecbdc05d8d385 (diff) | |
| download | rails-c163d93f948136d52195c644aa7bb23ec9795b38.tar.gz rails-c163d93f948136d52195c644aa7bb23ec9795b38.tar.bz2 rails-c163d93f948136d52195c644aa7bb23ec9795b38.zip | |
Merge pull request #26928 from kamipo/fix_name_error_2
Fix NameError: undefined local variable or method `result`
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb b/activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb index 274753a8a5..c7098105a8 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb @@ -86,8 +86,8 @@ module ActiveRecord end begin - ActiveSupport::Dependencies.interlock.permit_concurrent_loads do - result = stmt.execute(*type_casted_binds) + result = ActiveSupport::Dependencies.interlock.permit_concurrent_loads do + stmt.execute(*type_casted_binds) end rescue Mysql2::Error => e if cache_stmt |