From 7eb554bdb13d3469712b847add2ab0054f0698c7 Mon Sep 17 00:00:00 2001 From: Brian Lopez Date: Sat, 12 Feb 2011 16:54:27 -0800 Subject: [PATCH] switch over to Mysql2::Client#ping for the mysql2 connection check --- .../lib/active_record/connection_adapters/mysql2_adapter.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb index 74dd7e8491..7bad511c64 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb @@ -197,10 +197,7 @@ def disable_referential_integrity(&block) #:nodoc: def active? return false unless @connection - @connection.query 'select 1' - true - rescue Mysql2::Error - false + @connection.ping end def reconnect! -- GitLab