aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/vendor
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-01-18 09:54:12 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-01-18 09:54:12 +0000
commit53088c4c7f49c0574d0cb6466b4dc9c0b161a4d9 (patch)
tree77f7eafb2ff86874bde8ba42c0940237df71d1f1 /activerecord/lib/active_record/vendor
parentcd3f14cf38750dd82132e2ba06033a945be20915 (diff)
downloadrails-53088c4c7f49c0574d0cb6466b4dc9c0b161a4d9.tar.gz
rails-53088c4c7f49c0574d0cb6466b4dc9c0b161a4d9.tar.bz2
rails-53088c4c7f49c0574d0cb6466b4dc9c0b161a4d9.zip
Fixed that the Ruby/MySQL adapter wouldn't connect if the password was empty #503 [Pelle]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@454 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/vendor')
-rw-r--r--activerecord/lib/active_record/vendor/mysql411.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/vendor/mysql411.rb b/activerecord/lib/active_record/vendor/mysql411.rb
index 32d4084674..3daa846f16 100644
--- a/activerecord/lib/active_record/vendor/mysql411.rb
+++ b/activerecord/lib/active_record/vendor/mysql411.rb
@@ -139,6 +139,7 @@ class Mysql
# candidate_hash2=sha1(hash_stage1)
# check(candidate_hash2==hash_stage2)
def scramble411( password, seed, old_ver )
+ return "" if password == nil or password == ""
raise "old version password is not implemented" if old_ver
# print "Seed Bytes = "
@@ -302,4 +303,4 @@ class Mysql
end
self
end
-end \ No newline at end of file
+end