From bf588c69decfbf6ae65d68e24e1b2c2fb3c08a65 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arun@fromjaipur.com>
Date: Thu, 16 Jun 2011 10:48:28 +0530
Subject: [PATCH] Mysql bump

---
 Gemfile                                       | 19 ++++++++++---------
 .../connection_adapters/mysql2_adapter.rb     |  2 +-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Gemfile b/Gemfile
index 7b9a6e695c..212a848894 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source "http://rubygems.org"
 
 gemspec
 
@@ -35,19 +35,20 @@ end
 
 platforms :mri_19 do
   # TODO: Remove the conditional when ruby-debug19 supports Ruby >= 1.9.3
-  gem "ruby-debug19", :require => 'ruby-debug' if RUBY_VERSION < "1.9.3"
+  gem "ruby-debug19", :require => "ruby-debug" if RUBY_VERSION < "1.9.3"
 end
 
 platforms :ruby do
   if ENV["RB_FSEVENT"]
-    gem 'rb-fsevent'
+    gem "rb-fsevent"
   end
-  gem 'json'
-  gem 'yajl-ruby'
+  gem "json"
+  gem "yajl-ruby"
   gem "nokogiri", ">= 1.4.4"
 
   group :test do
-    gem 'ruby-prof'
+    gem "ruby-prof" if RUBY_VERSION < "1.9.3"
+
   end
   # AR
   gem "sqlite3", "~> 1.3.3"
@@ -55,7 +56,7 @@ platforms :ruby do
   group :db do
     gem "pg", ">= 0.11.0"
     gem "mysql", ">= 2.8.1"
-    gem "mysql2", ">= 0.3.4"
+    gem "mysql2", ">= 0.3.5"
   end
 end
 
@@ -78,10 +79,10 @@ end
 # gems that are necessary for ActiveRecord tests with Oracle database
 if ENV['ORACLE_ENHANCED_PATH'] || ENV['ORACLE_ENHANCED']
   platforms :ruby do
-    gem 'ruby-oci8', ">= 2.0.4"
+    gem "ruby-oci8", ">= 2.0.4"
   end
   if ENV['ORACLE_ENHANCED_PATH']
-    gem 'activerecord-oracle_enhanced-adapter', :path => ENV['ORACLE_ENHANCED_PATH']
+    gem "activerecord-oracle_enhanced-adapter", :path => ENV['ORACLE_ENHANCED_PATH']
   else
     gem "activerecord-oracle_enhanced-adapter", :git => "git://github.com/rsim/oracle-enhanced.git"
   end
diff --git a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
index 6871815124..5d9727d1ed 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.4'
+gem 'mysql2', '~> 0.3.5'
 require 'mysql2'
 
 module ActiveRecord