aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2011-06-17 10:22:34 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2011-06-17 10:22:34 -0700
commit9a64c8ec660a6dc20e8df26b0936502bd4c1ffb8 (patch)
tree9de703192a006b43ab28ceebf57018c2bbde5352 /activerecord/lib/active_record
parent0dd32e8edbc2ba5d4496e7f8063536c507b74c5f (diff)
parent301cad4476c89d4df2db38cbbe9dc87aa28b174f (diff)
downloadrails-9a64c8ec660a6dc20e8df26b0936502bd4c1ffb8.tar.gz
rails-9a64c8ec660a6dc20e8df26b0936502bd4c1ffb8.tar.bz2
rails-9a64c8ec660a6dc20e8df26b0936502bd4c1ffb8.zip
Merge pull request #1751 from guilleiguaran/mysql-0-3-6
Bump to mysql2 0.3.6
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
index 798c0db2cf..d6c167ad36 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
@@ -1,6 +1,6 @@
# encoding: utf-8
-gem 'mysql2', '~> 0.3.5'
+gem 'mysql2', '~> 0.3.6'
require 'mysql2'
module ActiveRecord