Merge branch 'master' into stmt

nyaxt · Apr 27, 2011 · f0df399 · f0df399
2 parents ef979d1 + 3f97238
commit f0df399
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.3.2 (April 26th, 2011)
+* Fix typo in initialization for older ActiveRecord versions
+
 ## 0.3.1 (April 26th, 2011)
 * Fix typo in initialization for older ActiveRecord versions
 

diff --git a/lib/mysql2.rb b/lib/mysql2.rb
@@ -16,7 +16,7 @@
 module Mysql2
 end
 
-if defined?(ActiveRecord::VERSION::STRING) < "3.1"
+if defined?(ActiveRecord::VERSION::STRING) && ActiveRecord::VERSION::STRING < "3.1"
   puts "WARNING: This version of mysql2 (#{Mysql2::VERSION}) doesn't ship with the ActiveRecord adapter bundled anymore as it's now part of Rails 3.1"
   puts "WARNING: Please use the 0.2.x releases if you plan on using it in Rails <= 3.0.x"
 end
diff --git a/lib/mysql2/version.rb b/lib/mysql2/version.rb
@@ -1,3 +1,3 @@
 module Mysql2
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end