Changeset 5930

Timestamp:

01/14/07 15:20:52 (2 years ago)

Author:

bitsweat

Message:

Merge [5929] from trunk. References #6976.

Files:

• branches/1-2-pre-release/activerecord/CHANGELOG (modified) (1 diff)
• branches/1-2-pre-release/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb (modified) (1 diff)

branches/1-2-pre-release/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* MySQL: retain SSL settings on reconnect.  #6976 [randyv2]
-
-* SQLServer: handle [quoted] table names.  #6635 [rrich]

branches/1-2-pre-release/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

@@ -386 +386 @@
-            @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