diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-08-03 02:15:12 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-08-03 02:15:12 +0200 |
| commit | 4dc2521028140d005b0871ab5d8b02694dbf58c3 (patch) | |
| tree | beacf9a7b93180ce32e69f0491245aa64fbb1017 /activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | |
| parent | 88b5f938cf7d3eb26ad204451a4dbb9c2cf4f571 (diff) | |
| parent | db0e3e5ad1db9bc0204db1dbc4075180bce3bc93 (diff) | |
| download | rails-4dc2521028140d005b0871ab5d8b02694dbf58c3.tar.gz rails-4dc2521028140d005b0871ab5d8b02694dbf58c3.tar.bz2 rails-4dc2521028140d005b0871ab5d8b02694dbf58c3.zip | |
Merge remote branch 'docrails/master' into 3-0-stable
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/mysql_adapter.rb')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | 3 |
1 files changed, 2 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 b403443d8e..cc7c07dc35 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb @@ -278,7 +278,8 @@ module ActiveRecord rows end - # Executes a SQL query and returns a MySQL::Result object. Note that you have to free the Result object after you're done using it. + # Executes a 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 @connection.query(sql) |