maria-developers team mailing list archive

Thread
Date

bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (monty:2788)

To: maria-developers@xxxxxxxxxxxxxxxxxxx
From: Michael Widenius <monty@xxxxxxxxxxxx>
Date: Mon, 04 Jan 2010 18:25:32 -0000
User-agent: Bazaar (2.0.3)

#At lp:maria based on revid:monty@xxxxxxxxxxxx-20100104123554-wt8n85bd7zh0a47c

 2788 Michael Widenius	2010-01-04
      Fixed bug in tc.log recovery code that caused crash_commit_before to sometimes crash.
      modified:
        sql/log.cc

=== modified file 'sql/log.cc'
--- a/sql/log.cc	2009-12-03 11:19:05 +0000
+++ b/sql/log.cc	2010-01-04 18:25:29 +0000
@@ -5154,8 +5154,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);