Permalink
Browse files

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
  • Loading branch information...
1 parent 2b6954a commit 2d5bf4bbed92c079cbd68d196b49d227782e0191 @jeremy jeremy committed Jan 14, 2007
Showing with 3 additions and 0 deletions.
  1. +2 −0 activerecord/CHANGELOG
  2. +1 −0 activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
View
@@ -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]
@@ -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

0 comments on commit 2d5bf4b

Please sign in to comment.