From 0227f86eee4502588c1d56638f2dabcb886cde28 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Sun, 14 Jan 2007 15:19:18 +0000 Subject: MySQL: retain SSL settings on reconnect. Closes #6976. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5929 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'activerecord/lib/active_record/connection_adapters') diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb index d7668140fd..9bc4c94373 100755 --- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb @@ -385,6 +385,7 @@ module ActiveRecord if encoding @connection.options(Mysql::SET_CHARSET_NAME, encoding) rescue nil end + @connection.ssl_set(@config[:sslkey], @config[:sslcert], @config[:sslca], @config[:sslcapath], @config[:sslcipher]) if @config[:sslkey] @connection.real_connect(*@connection_options) execute("SET NAMES '#{encoding}'") if encoding end -- cgit v1.2.3