Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/work-maria.bak

into  desktop.sanja.is.com.ua:/home/bell/mysql/bk/work-test


include/maria.h:
  Auto merged
mysys/Makefile.am:
  Auto merged
mysys/mf_keycaches.c:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
storage/maria/Makefile.am:
  Auto merged
storage/maria/ha_maria.cc:
  Auto merged
storage/maria/ma_bitmap.c:
  Auto merged
storage/maria/ma_check.c:
  Auto merged
storage/maria/ma_close.c:
  Auto merged
storage/maria/ma_dynrec.c:
  Auto merged
storage/maria/ma_extra.c:
  Auto merged
storage/maria/ma_info.c:
  Auto merged
storage/maria/ma_keycache.c:
  Auto merged
storage/maria/ma_locking.c:
  Auto merged
storage/maria/ma_loghandler.c:
  Auto merged
storage/maria/ma_open.c:
  Auto merged
storage/maria/ma_packrec.c:
  Auto merged
storage/maria/ma_page.c:
  Auto merged
storage/maria/ma_pagecache.c:
  Auto merged
storage/maria/ma_panic.c:
  Auto merged
storage/maria/ma_preload.c:
  Auto merged
storage/maria/ma_static.c:
  Auto merged
storage/maria/ma_test1.c:
  Auto merged
storage/maria/ma_test2.c:
  Auto merged
storage/maria/ma_test3.c:
  Auto merged
storage/maria/ma_write.c:
  Auto merged
storage/maria/maria_chk.c:
  Auto merged
storage/maria/maria_def.h:
  Auto merged
storage/maria/maria_ftdump.c:
  Auto merged
storage/maria/maria_pack.c:
  Auto merged
sql/handler.cc:
  merge
storage/maria/ma_blockrec.c:
  merge
storage/maria/ma_delete_all.c:
  merge

1 files changed, 2 insertions, 2 deletions

diff --git a/storage/maria/ma_info.c b/storage/maria/ma_info.c
index 366243ccba7..612f6342b96 100644
--- a/storage/maria/ma_info.c
+++ b/storage/maria/ma_info.c
@@ -71,7 +71,7 @@ int maria_status(MARIA_HA *info, register MARIA_INFO *x, uint flag)
     x->reclength	= share->base.reclength;
     x->max_data_file_length=share->base.max_data_file_length;
     x->max_index_file_length=info->s->base.max_key_file_length;
-    x->filenr	 = info->dfile;
+    x->filenr	 = info->dfile.file;
     x->options	 = share->options;
     x->create_time=share->state.create_time;
     x->reflength= maria_get_pointer_length(share->base.max_data_file_length,
@@ -85,7 +85,7 @@ int maria_status(MARIA_HA *info, register MARIA_INFO *x, uint flag)
     x->index_file_name  = share->index_file_name;
     x->data_file_type   = share->data_file_type;
   }
-  if ((flag & HA_STATUS_TIME) && !my_fstat(info->dfile,&state,MYF(0)))
+  if ((flag & HA_STATUS_TIME) && !my_fstat(info->dfile.file, &state, MYF(0)))
     x->update_time=state.st_mtime;
   else
     x->update_time=0;