From: monty
Date: May 29 2008 8:56pm
Subject: bk commit into maria tree (monty:1.2634)
List-Archive: http://lists.mysql.com/maria/55
Message-Id: <20080529205631.9B1F7385FAA4@mysql.fi>

Below is the list of changes that have just been committed into a local
maria repository of monty.  When monty 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-05-29 23:56:27+03:00, monty@stripped +4 -0
  After merge fixes

  mysys/my_handler_errors.h@stripped, 2008-05-29 23:56:23+03:00, monty@stripped +4 -3
    Updated error messages

  storage/maria/ha_maria.cc@stripped, 2008-05-29 23:56:23+03:00, monty@stripped +2 -0
    After merge fix

  storage/maria/ma_rt_key.c@stripped, 2008-05-29 23:56:23+03:00, monty@stripped +1 -1
    Use share->state.state instead of info->state

  storage/maria/ma_rt_test.c@stripped, 2008-05-29 23:56:23+03:00, monty@stripped +1 -1
    After merge fix

diff -Nrup a/mysys/my_handler_errors.h b/mysys/my_handler_errors.h
--- a/mysys/my_handler_errors.h	2008-04-29 09:26:30 +03:00
+++ b/mysys/my_handler_errors.h	2008-05-29 23:56:23 +03:00
@@ -55,13 +55,14 @@ static const char *handler_error_message
   "Failed to get next auto increment value",
   "Failed to set row auto increment value",
   "Unknown (generic) error from engine",
-  "Record is the same",
+  "Record was not update. Original values was same as new values",
   "It is not possible to log this statement",
   "The event was corrupt, leading to illegal data being read",
   "The table is of a new format not supported by this version",
-  "The event could not be processed no other handler error happened",
+  "The event could not be processed. No other handler error happened",
   "Got a fatal error during initialization of handler",
   "File too short; Expected more data in file",
-  "Read page with wrong checksum"
+  "Read page with wrong checksum",
+  "Row is not visible by the current transaction"
 };
 
diff -Nrup a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc
--- a/storage/maria/ha_maria.cc	2008-05-29 21:39:21 +03:00
+++ b/storage/maria/ha_maria.cc	2008-05-29 23:56:23 +03:00
@@ -2859,6 +2859,8 @@ my_bool ha_maria::register_query_cache_t
 					     *engine_callback,
 					     ulonglong *engine_data)
 {
+  ulonglong actual_data_file_length;
+  ulonglong current_data_file_length;
   DBUG_ENTER("ha_maria::register_query_cache_table");
 
   /*
diff -Nrup a/storage/maria/ma_rt_key.c b/storage/maria/ma_rt_key.c
--- a/storage/maria/ma_rt_key.c	2008-04-24 18:22:46 +03:00
+++ b/storage/maria/ma_rt_key.c	2008-05-29 23:56:23 +03:00
@@ -58,7 +58,7 @@ int maria_rtree_add_key(MARIA_HA *info, 
       /* save key */
       DBUG_ASSERT(_ma_dpos(info, nod_flag, key + key_length +
                            share->base.rec_reflength) <
-                  info->state->data_file_length +
+                  share->state.state.data_file_length +
                   share->base.pack_reclength);
       memcpy(key_pos, key, key_length + share->base.rec_reflength);
       added_len= key_length + share->base.rec_reflength;
diff -Nrup a/storage/maria/ma_rt_test.c b/storage/maria/ma_rt_test.c
--- a/storage/maria/ma_rt_test.c	2008-04-24 18:22:47 +03:00
+++ b/storage/maria/ma_rt_test.c	2008-05-29 23:56:23 +03:00
@@ -99,7 +99,7 @@ int main(int argc, char *argv[])
   if (maria_init() ||
       (init_pagecache(maria_pagecache, maria_block_size * 16, 0, 0,
                       maria_block_size, MY_WME) == 0) ||
-      ma_control_file_open(TRUE) ||
+      ma_control_file_open(TRUE, TRUE) ||
       (init_pagecache(maria_log_pagecache,
                       TRANSLOG_PAGECACHE_SIZE, 0, 0,
                       TRANSLOG_PAGE_SIZE, MY_WME) == 0) ||