1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge bk-internal.mysql.com:/home/bk/mysql-maria

Browse Source 
into  janus.mylan:/usr/home/serg/Abk/mysql-maria
This commit is contained in:
unknown 2007-12-17 09:56:52 +01:00
commit 2b7a69457c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mysys/my_uuid.c
View File

@ -105,13 +105,12 @@ void my_uuid_init(ulong seed1, ulong seed2)
randominit() here. randominit() here.
*/ */
/* purecov: begin inspected */ /* 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++) for (i=0; i < sizeof(mac); i++)
mac[i]= (uchar)(my_rnd(&uuid_rand)*255); mac[i]= (uchar)(my_rnd(&uuid_rand)*255);
/* purecov: end */ /* purecov: end */
} }
my_rnd_init(&uuid_rand, (ulong) (seed1 + now), my_rnd_init(&uuid_rand, (ulong) (seed1 + now), (ulong) (now/2+ getpid()));
(ulong) (now/2+ seed2 + getpid()));
set_clock_seq(); set_clock_seq();
pthread_mutex_init(&LOCK_uuid_generator, MY_MUTEX_INIT_FAST); pthread_mutex_init(&LOCK_uuid_generator, MY_MUTEX_INIT_FAST);
} }

1
sql/mysqld.cc
View File

@ -3249,6 +3249,7 @@ static int init_server_components()
my_rnd_init(&sql_rand,(ulong) server_start_time,(ulong) server_start_time/2); my_rnd_init(&sql_rand,(ulong) server_start_time,(ulong) server_start_time/2);
reset_floating_point_exceptions(); reset_floating_point_exceptions();
init_thr_lock(); init_thr_lock();
my_uuid_init(my_rnd(&sql_rand),12345);
#ifdef HAVE_REPLICATION #ifdef HAVE_REPLICATION
init_slave_list(); init_slave_list();
#endif #endif