aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2005-07-03 08:32:52 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2005-07-03 08:32:52 +0000
commit94cd3fd135337d1b228404d9d167bd0031ddefe8 (patch)
treedd3891cca4fb8f612f93ab4cd378742e29ee59da /activerecord
parent9a10b31fe87710ba745db735f0c10365caa1eb5c (diff)
downloadrails-94cd3fd135337d1b228404d9d167bd0031ddefe8.tar.gz
rails-94cd3fd135337d1b228404d9d167bd0031ddefe8.tar.bz2
rails-94cd3fd135337d1b228404d9d167bd0031ddefe8.zip
r1616@asus: jeremy | 2005-07-03 08:07:13 -0700
remove duplicate conditional git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1634 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord')
-rwxr-xr-xactiverecord/lib/active_record/connection_adapters/mysql_adapter.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
index edfdc44f83..b026a72093 100755
--- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -120,10 +120,10 @@ module ActiveRecord
rescue ActiveRecord::StatementInvalid => exception
if LOST_CONNECTION_ERROR_MESSAGES.any? { |msg| exception.message.split(":").first =~ /^#{msg}/ }
@connection.real_connect(*@connection_options)
- @logger.info("Retrying invalid statement with reopened connection") if @logger
unless @logger
@connection.query(sql)
else
+ @logger.info "Retrying invalid statement with reopened connection"
log(sql, name) { @connection.query(sql) }
end
else