diff options
author | Emilio Tagua <miloops@gmail.com> | 2009-09-21 14:57:24 -0300 |
---|---|---|
committer | Emilio Tagua <miloops@gmail.com> | 2009-09-21 14:57:24 -0300 |
commit | a294d8362bfb62b7133ad0799ae1327cd5ddd1e4 (patch) | |
tree | 477930041d5c42f2453178ab110c8455c6d702fe /activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | |
parent | 378b02d3aa890cedabf1ef81c34a371dbbc52c25 (diff) | |
parent | e2d0b0ee61c5a8c2626abb5ac1029b48ec1965eb (diff) | |
download | rails-a294d8362bfb62b7133ad0799ae1327cd5ddd1e4.tar.gz rails-a294d8362bfb62b7133ad0799ae1327cd5ddd1e4.tar.bz2 rails-a294d8362bfb62b7133ad0799ae1327cd5ddd1e4.zip |
Merge commit 'rails/master'
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/mysql_adapter.rb')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb index ddcbba032f..ad36ff22e3 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb @@ -65,12 +65,15 @@ module ActiveRecord raise end end + MysqlCompat.define_all_hashes_method! mysql = Mysql.init mysql.ssl_set(config[:sslkey], config[:sslcert], config[:sslca], config[:sslcapath], config[:sslcipher]) if config[:sslca] || config[:sslkey] - ConnectionAdapters::MysqlAdapter.new(mysql, logger, [host, username, password, database, port, socket], config) + default_flags = Mysql.const_defined?(:CLIENT_MULTI_RESULTS) ? Mysql::CLIENT_MULTI_RESULTS : 0 + options = [host, username, password, database, port, socket, default_flags] + ConnectionAdapters::MysqlAdapter.new(mysql, logger, options, config) end end |