diff options
| author | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2007-12-17 13:44:49 +0200 |
|---|---|---|
| committer | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2007-12-17 13:44:49 +0200 |
| commit | fcc1cc8ab510f67838ac9fd1009ec95396bc8c7a (patch) | |
| tree | 41a5cf907d51857174789869d2ed0d81365ffa76 /mysys | |
| parent | 1b68e2ea36784d477831c51c238aa7baa5b55b8b (diff) | |
| parent | 2b7a69457cc48bf25724e8a89ec48d343c15b26c (diff) | |
| download | mariadb-git-fcc1cc8ab510f67838ac9fd1009ec95396bc8c7a.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-maria
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-maria.new
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'mysys')
| -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); } |