Merge neptunus.(none):/home/msvensson/mysql/bug13164/my50-bug13164

into neptunus.(none):/home/msvensson/mysql/mysql-5.0

Merge neptunus.(none):/home/msvensson/mysql/bug13164/my50-bug13164
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
306dcf06 · msvensson@neptunus.(none) · ff8127ff · 139601f9 · 306dcf06
Commit 306dcf06 authored Sep 22, 2005 by msvensson@neptunus.(none)
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

extra/yassl/taocrypt/src/random.cpp extra/yassl/taocrypt/src/random.cpp +4 -0

No files found.
--- a/extra/yassl/taocrypt/src/random.cpp
+++ b/extra/yassl/taocrypt/src/random.cpp
@@ -94,8 +94,12 @@ void OS_Seed::GenerateSeed(byte* output, word32 sz)
 OS_Seed::OS_Seed() 
 {
    fd_ = open("/dev/urandom",O_RDONLY);
+    if (fd_ == -1)
+    {
+      fd_ = open("/dev/random",O_RDONLY);
      if (fd_ == -1)
        error_.SetError(OPEN_RAN_E);
+    }
 }