diff options
author | unknown <serg@janus.mylan> | 2007-12-16 12:31:29 +0100 |
---|---|---|
committer | unknown <serg@janus.mylan> | 2007-12-16 12:31:29 +0100 |
commit | c4c63a1425705f8aec9a4cb2ce9aa352defad712 (patch) | |
tree | 061e00c8d7d937219dd47303b88ed06528f6a512 /mysys/my_uuid.c | |
parent | fe2636faaa50b2e46f22631badf2465be7c9a74d (diff) | |
download | mariadb-git-c4c63a1425705f8aec9a4cb2ce9aa352defad712.tar.gz |
my_uuid_init() was forgotten
mysys/my_uuid.c:
de-corelate two randominit's
sql/mysqld.cc:
my_uuid_init() was forgotten here
Diffstat (limited to 'mysys/my_uuid.c')
-rw-r--r-- | mysys/my_uuid.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mysys/my_uuid.c b/mysys/my_uuid.c index 3c3cd8836fc..79d89920085 100644 --- a/mysys/my_uuid.c +++ b/mysys/my_uuid.c @@ -105,13 +105,12 @@ void my_uuid_init(ulong seed1, ulong seed2) randominit() here. */ /* purecov: begin inspected */ - my_rnd_init(&uuid_rand, (ulong) (seed2+ now/2), (seed1 + now)+random()); + my_rnd_init(&uuid_rand, (ulong) (seed2+ now/2), now+random()); for (i=0; i < sizeof(mac); i++) mac[i]= (uchar)(my_rnd(&uuid_rand)*255); - /* purecov: end */ + /* purecov: end */ } - my_rnd_init(&uuid_rand, (ulong) (seed1 + now), - (ulong) (now/2+ seed2 + getpid())); + my_rnd_init(&uuid_rand, (ulong) (seed1 + now), (ulong) (now/2+ getpid())); set_clock_seq(); pthread_mutex_init(&LOCK_uuid_generator, MY_MUTEX_INIT_FAST); } |