Merge sanja.is.com.ua:/home/bell/mysql/bk/work-5.1

into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge-maria


BitKeeper/etc/ignore:
  auto-union
include/my_base.h:
  Auto merged
include/myisam.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_class.h:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
storage/myisam/Makefile.am:
  Auto merged
storage/myisam/ft_boolean_search.c:
  Auto merged
storage/myisam/ft_nlq_search.c:
  Auto merged
storage/myisam/ft_parser.c:
  Auto merged
storage/myisam/ft_update.c:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_create.c:
  Auto merged
storage/myisam/mi_dynrec.c:
  Auto merged
storage/myisam/mi_key.c:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/myisam/mi_packrec.c:
  Auto merged
storage/myisam/mi_search.c:
  Auto merged
storage/myisam/mi_test1.c:
  Auto merged
storage/myisam/mi_test2.c:
  Auto merged
storage/myisam/myisamchk.c:
  Auto merged
storage/myisam/myisamlog.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
BUILD/SETUP.sh:
  merge
configure.in:
  merge
libmysqld/Makefile.am:
  merge
sql/handler.h:
  merge
sql/set_var.cc:
  merge
storage/Makefile.am:
  merge
storage/myisam/myisamdef.h:
  merge

1 files changed, 5 insertions, 5 deletions

diff --git a/storage/myisam/mi_dynrec.c b/storage/myisam/mi_dynrec.c
index 9d76a1fb9a5..73d46201d5e 100644
--- a/storage/myisam/mi_dynrec.c
+++ b/storage/myisam/mi_dynrec.c
@@ -245,7 +245,7 @@ int _mi_write_blob_record(MI_INFO *info, const byte *record)
   extra= (ALIGN_SIZE(MI_MAX_DYN_BLOCK_HEADER)+MI_SPLIT_LENGTH+
 	  MI_DYN_DELETE_BLOCK_HEADER+1);
   reclength= (info->s->base.pack_reclength +
-	      _my_calc_total_blob_length(info,record)+ extra);
+	      _mi_calc_total_blob_length(info,record)+ extra);
 #ifdef NOT_USED					/* We now support big rows */
   if (reclength > MI_DYN_MAX_ROW_LENGTH)
   {
@@ -279,7 +279,7 @@ int _mi_update_blob_record(MI_INFO *info, my_off_t pos, const byte *record)
   extra= (ALIGN_SIZE(MI_MAX_DYN_BLOCK_HEADER)+MI_SPLIT_LENGTH+
 	  MI_DYN_DELETE_BLOCK_HEADER);
   reclength= (info->s->base.pack_reclength+
-	      _my_calc_total_blob_length(info,record)+ extra);
+	      _mi_calc_total_blob_length(info,record)+ extra);
 #ifdef NOT_USED					/* We now support big rows */
   if (reclength > MI_DYN_MAX_ROW_LENGTH)
   {
@@ -1249,7 +1249,7 @@ err:
 
 	/* Calc length of blob. Update info in blobs->length */
 
-ulong _my_calc_total_blob_length(MI_INFO *info, const byte *record)
+ulong _mi_calc_total_blob_length(MI_INFO *info, const byte *record)
 {
   ulong length;
   MI_BLOB *blob,*end;
@@ -1283,7 +1283,7 @@ ulong _mi_calc_blob_length(uint length, const byte *pos)
 }
 
 
-void _my_store_blob_length(byte *pos,uint pack_length,uint length)
+void _mi_store_blob_length(byte *pos,uint pack_length,uint length)
 {
   switch (pack_length) {
   case 1:
@@ -1436,7 +1436,7 @@ int _mi_cmp_dynamic_record(register MI_INFO *info, register const byte *record)
     if (info->s->base.blobs)
     {
       if (!(buffer=(byte*) my_alloca(info->s->base.pack_reclength+
-				     _my_calc_total_blob_length(info,record))))
+				     _mi_calc_total_blob_length(info,record))))
 	DBUG_RETURN(-1);
     }
     reclength=_mi_rec_pack(info,buffer,record);