bk commit into maria tree (bell:1.2623)

[sanja]

Below is the list of changes that have just been committed into a local
maria repository of bell.  When bell does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-03-24 13:00:44+02:00, bell@stripped +1 -0
  not to push

  storage/maria/ma_loghandler.c@stripped, 2008-03-24 13:00:37+02:00, bell@stripped +12 -2
    fixed ASSERT (not to push)

diff -Nrup a/storage/maria/ma_loghandler.c b/storage/maria/ma_loghandler.c
--- a/storage/maria/ma_loghandler.c	2008-03-24 01:38:55 +02:00
+++ b/storage/maria/ma_loghandler.c	2008-03-24 13:00:37 +02:00
@@ -6928,8 +6928,18 @@ static my_bool translog_record_read_next
                 data->header.chunk0_data_len, data->scanner.page_offset,
                 data->current_group, data->header.groups_no - 1));
     DBUG_ASSERT(data->header.groups_no - 1 == data->current_group);
-    DBUG_ASSERT(data->header.lsn ==
-                data->scanner.page_addr + data->scanner.page_offset);
+    /*
+      if data->header.chunk0_pages > 1 it is not possible to calculate
+      the data page because simple formula:
+      data->header.lsn +
+      (data->header.chunk0_pages - 1) * TRANSLOG_PAGE_SIZE =
+      data->scanner.page_addr + data->scanner.page_offset
+      might not be working if we have started new file during writing chunk0
+      pages
+    */
+    DBUG_ASSERT((data->header.lsn ==
+                 data->scanner.page_addr + data->scanner.page_offset) ||
+                (data->header.chunk0_pages > 1));
     translog_destroy_scanner(&data->scanner);
     translog_scanner_init(data->header.chunk0_data_addr, 1, &data->scanner, 1);
     data->chunk_size= data->header.chunk0_data_len;