aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/CHANGELOG5
-rw-r--r--activerecord/lib/active_record/vendor/mysql411.rb3
2 files changed, 7 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 4ebd49f333..2a5c4cd878 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,3 +1,8 @@
+*SVN*
+
+* Fixed that the Ruby/MySQL adapter wouldn't connect if the password was empty #503 [Pelle]
+
+
*1.5.0* (January 17th, 2005)
* Fixed that unit tests for MySQL are now run as the "rails" user instead of root #455 [Eric Hodel]
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