aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2010-08-19 19:13:27 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2010-08-19 19:13:50 -0700
commitbfd8be7fab67419ab307c350a75af0b86037d9ed (patch)
treeea936236da39f6b2b36a30a954301fb27f55b7f0 /activerecord/lib/active_record/connection_adapters
parent0b73f2af0e08c21ff75199505804993160117452 (diff)
downloadrails-bfd8be7fab67419ab307c350a75af0b86037d9ed.tar.gz
rails-bfd8be7fab67419ab307c350a75af0b86037d9ed.tar.bz2
rails-bfd8be7fab67419ab307c350a75af0b86037d9ed.zip
updates return number of rows matched rather than number of rows affected
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
-rw-r--r--activerecord/lib/active_record/connection_adapters/mysql_adapter.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
index 9950387420..d797f9c6c3 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -31,6 +31,7 @@ module ActiveRecord
mysql.ssl_set(config[:sslkey], config[:sslcert], config[:sslca], config[:sslcapath], config[:sslcipher]) if config[:sslca] || config[:sslkey]
default_flags = Mysql.const_defined?(:CLIENT_MULTI_RESULTS) ? Mysql::CLIENT_MULTI_RESULTS : 0
+ default_flags |= Mysql::CLIENT_FOUND_ROWS if Mysql.const_defined?(:CLIENT_FOUND_ROWS)
options = [host, username, password, database, port, socket, default_flags]
ConnectionAdapters::MysqlAdapter.new(mysql, logger, options, config)
end