maria-developers team mailing list archive

[Michael Widenius <monty@xxxxxxxxxxxx>]

#At lp:maria/5.2 based on revid:monty@xxxxxxxxxxxx-20100104175442-305w0x6tg4opi7rb

 2736 Michael Widenius	2010-01-04 [merge]
      Merge bug fixes from 5.1
      modified:
        mysys/my_uuid.c
        sql/log.cc

=== modified file 'mysys/my_uuid.c'
--- a/mysys/my_uuid.c	2009-02-01 12:02:29 +0000
+++ b/mysys/my_uuid.c	2010-01-04 18:31:26 +0000
@@ -108,7 +108,7 @@ void my_uuid_init(ulong seed1, ulong see
     */
     /* purecov: begin inspected */
     my_rnd_init(&uuid_rand, (ulong) (seed2+ now/2), (ulong) (now+rand()));
-    for (i=0; i < sizeof(mac); i++)
+    for (i=0; i < array_elements(uuid_suffix) -2 ; i++)
       mac[i]= (uchar)(my_rnd(&uuid_rand)*255);
     /* purecov: end */
   }

=== modified file 'sql/log.cc'
--- a/sql/log.cc	2010-01-04 17:54:42 +0000
+++ b/sql/log.cc	2010-01-04 21:53:10 +0000
@@ -5192,8 +5192,8 @@ int TC_LOG_MMAP::open(const char *opt_na
     pthread_mutex_init(&pg->lock, MY_MUTEX_INIT_FAST);
     pthread_cond_init (&pg->cond, 0);
     pg->start=(my_xid *)(data + i*tc_log_page_size);
-    pg->end=(my_xid *)(pg->start + tc_log_page_size);
     pg->size=pg->free=tc_log_page_size/sizeof(my_xid);
+    pg->end=pg->start + pg->size;
   }
   pages[0].size=pages[0].free=
                 (tc_log_page_size-TC_LOG_HEADER_SIZE)/sizeof(my_xid);