diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-08-05 01:15:57 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-08-05 01:15:57 +0200 |
| commit | 3cbe111439b22f11670587e2ec6779533dd77090 (patch) | |
| tree | 541ec151c0899e21c3bef1c4b7ad9136b42f9b2f /activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | |
| parent | ec736dff7b0a05d58d4c8780863afc47e2bb74a3 (diff) | |
| parent | d191db76e04f065e1b0cff3766c818f9b8e2f43a (diff) | |
| download | rails-3cbe111439b22f11670587e2ec6779533dd77090.tar.gz rails-3cbe111439b22f11670587e2ec6779533dd77090.tar.bz2 rails-3cbe111439b22f11670587e2ec6779533dd77090.zip | |
Merge remote branch 'docrails/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 | 2 |
1 files changed, 1 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 cc7c07dc35..ba0051de05 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb @@ -278,7 +278,7 @@ module ActiveRecord rows end - # Executes a SQL query and returns a MySQL::Result object. Note that you have to free + # Executes an SQL query and returns a MySQL::Result object. Note that you have to free # the Result object after you're done using it. def execute(sql, name = nil) #:nodoc: if name == :skip_logging |