Commit 0ce96763 authored by unknown's avatar unknown

my_uuid_init() was forgotten


mysys/my_uuid.c:
  de-corelate two randominit's
sql/mysqld.cc:
  my_uuid_init() was forgotten here
parent 4355adc1
......@@ -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 */
}
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);
}
......
......@@ -3249,6 +3249,7 @@ static int init_server_components()
my_rnd_init(&sql_rand,(ulong) server_start_time,(ulong) server_start_time/2);
reset_floating_point_exceptions();
init_thr_lock();
my_uuid_init(my_rnd(&sql_rand),12345);
#ifdef HAVE_REPLICATION
init_slave_list();
#endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment