From 0816d9a70e8e93139ec41e45967e7e44acce74b9 Mon Sep 17 00:00:00 2001
From: unknown <monty@mysql.com/narttu.mysql.fi>
Date: Thu, 29 May 2008 23:56:27 +0300
Subject: [PATCH] After merge fixes

mysys/my_handler_errors.h:
  Updated error messages
storage/maria/ha_maria.cc:
  After merge fix
storage/maria/ma_rt_key.c:
  Use share->state.state instead of info->state
storage/maria/ma_rt_test.c:
  After merge fix
---
 mysys/my_handler_errors.h  | 7 ++++---
 storage/maria/ha_maria.cc  | 2 ++
 storage/maria/ma_rt_key.c  | 2 +-
 storage/maria/ma_rt_test.c | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/mysys/my_handler_errors.h b/mysys/my_handler_errors.h
index 483f1090e6a..4c952466545 100644
--- a/mysys/my_handler_errors.h
+++ b/mysys/my_handler_errors.h
@@ -55,13 +55,14 @@ static const char *handler_error_messages[]=
   "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 --git a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc
index 0c2efac2ee7..3a4f2b6df23 100644
--- a/storage/maria/ha_maria.cc
+++ b/storage/maria/ha_maria.cc
@@ -2859,6 +2859,8 @@ my_bool ha_maria::register_query_cache_table(THD *thd, char *table_name,
 					     *engine_callback,
 					     ulonglong *engine_data)
 {
+  ulonglong actual_data_file_length;
+  ulonglong current_data_file_length;
   DBUG_ENTER("ha_maria::register_query_cache_table");
 
   /*
diff --git a/storage/maria/ma_rt_key.c b/storage/maria/ma_rt_key.c
index dc37e4d166a..901e769f554 100644
--- a/storage/maria/ma_rt_key.c
+++ b/storage/maria/ma_rt_key.c
@@ -58,7 +58,7 @@ int maria_rtree_add_key(MARIA_HA *info, const MARIA_KEYDEF *keyinfo,
       /* 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 --git a/storage/maria/ma_rt_test.c b/storage/maria/ma_rt_test.c
index 10d3fc6eeeb..b329254149e 100644
--- a/storage/maria/ma_rt_test.c
+++ b/storage/maria/ma_rt_test.c
@@ -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) ||