Ticket #5260: mysql_client_flags.diff
| File mysql_client_flags.diff, 1.1 kB (added by llasram@gmail.com, 2 years ago) |
|---|
-
activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
old new 24 24 socket = config[:socket] 25 25 username = config[:username] ? config[:username].to_s : 'root' 26 26 password = config[:password].to_s 27 flags = (config[:flags] || []).inject(0) do |total, flag| 28 total | Mysql.const_get(flag.to_s) 29 end 27 30 28 31 if config.has_key?(:database) 29 32 database = config[:database] … … 33 36 34 37 mysql = Mysql.init 35 38 mysql.ssl_set(config[:sslkey], config[:sslcert], config[:sslca], config[:sslcapath], config[:sslcipher]) if config[:sslkey] 36 ConnectionAdapters::MysqlAdapter.new(mysql, logger, [host, username, password, database, port, socket ], config)39 ConnectionAdapters::MysqlAdapter.new(mysql, logger, [host, username, password, database, port, socket, flags], config) 37 40 end 38 41 end 39 42
