fixes after merge
This commit is contained in:
parent
a45cb10dec
commit
9241f35df3
|
@ -243,6 +243,11 @@ module ActiveRecord
|
||||||
connect
|
connect
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# this is set to true in 2.3, but we don't want it to be
|
||||||
|
def requires_reloading?
|
||||||
|
false
|
||||||
|
end
|
||||||
|
|
||||||
def disconnect!
|
def disconnect!
|
||||||
unless @connection.nil?
|
unless @connection.nil?
|
||||||
@connection.close
|
@connection.close
|
||||||
|
@ -564,6 +569,7 @@ module ActiveRecord
|
||||||
private
|
private
|
||||||
def connect
|
def connect
|
||||||
@connection = Mysql2::Client.new(@config)
|
@connection = Mysql2::Client.new(@config)
|
||||||
|
configure_connection
|
||||||
end
|
end
|
||||||
|
|
||||||
def configure_connection
|
def configure_connection
|
||||||
|
|
Loading…
Reference in New Issue