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

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);
 }

sql/mysqld.cc

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