Merge [5929] from trunk. References #6976.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5930 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
rails · Jan 14, 2007 · 2d5bf4b · 2d5bf4b
1 parent 2b6954a
commit 2d5bf4b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* MySQL: retain SSL settings on reconnect.  #6976 [randyv2]
+
 * SQLServer: handle [quoted] table names.  #6635 [rrich]
 
 * acts_as_nested_set works with single-table inheritance.  #6030 [Josh Susser]

diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -385,6 +385,7 @@ def connect
           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