New improved IO_CACHE

include/my_global.h:
  Remove dbug_assert()  (One should use DBUG_ASSERT() instead)
mysql-test/mysql-test-run.sh:
  Fixed that xterm works on Solaris 2.8.
  Fixed printing of errors
mysql-test/r/isam.result:
  Removed MyISAM test from ISAM test
mysql-test/t/isam.test:
  Removed MyISAM test from ISAM test
mysys/my_alloc.c:
  Removed warnings
mysys/my_bitmap.c:
  Use DBUG_ASSERT
mysys/my_pthread.c:
  Use DBUG_ASSERT
mysys/my_seek.c:
  More DBUG
sql/ha_berkeley.cc:
  Use DBUG_ASSERT
sql/ha_innobase.cc:
  Use DBUG_ASSERT
sql/log.cc:
  Use DBUG_ASSERT
sql/opt_range.cc:
  Use DBUG_ASSERT
sql/sql_base.cc:
  Use DBUG_ASSERT
sql/sql_handler.cc:
  Use DBUG_ASSERT
sql/sql_load.cc:
  Cleanup
sql/sql_parse.cc:
  Use DBUG_ASSERT
sql/sql_repl.cc:
  Cleanup
sql/sql_select.cc:
  Use DBUG_ASSERT
tools/mysqlmanager.c:
  Cleanup

3 files changed, 10 insertions, 10 deletions

diff --git a/isam/_cache.c b/isam/_cache.c
index 53619126660..9383c04dfbc 100644
--- a/isam/_cache.c
+++ b/isam/_cache.c
@@ -46,11 +46,11 @@ int _nisam_read_cache(IO_CACHE *info, byte *buff, ulong pos, uint length,
     buff+=read_length;
   }
   if ((offset=pos - (ulong) info->pos_in_file) <
-      (ulong) (info->rc_end - info->rc_request_pos))
+      (ulong) (info->read_end - info->request_pos))
   {
-    in_buff_pos=info->rc_request_pos+(uint) offset;
-    in_buff_length= min(length,(uint) (info->rc_end-in_buff_pos));
-    memcpy(buff,info->rc_request_pos+(uint) offset,(size_t) in_buff_length);
+    in_buff_pos=info->request_pos+(uint) offset;
+    in_buff_length= min(length,(uint) (info->read_end-in_buff_pos));
+    memcpy(buff,info->request_pos+(uint) offset,(size_t) in_buff_length);
     if (!(length-=in_buff_length))
       return 0;
     pos+=in_buff_length;
@@ -61,14 +61,14 @@ int _nisam_read_cache(IO_CACHE *info, byte *buff, ulong pos, uint length,
   if (flag & READING_NEXT)
   {
     if (pos != ((info)->pos_in_file +
-		(uint) ((info)->rc_end - (info)->rc_request_pos)))
+		(uint) ((info)->read_end - (info)->request_pos)))
     {
       info->pos_in_file=pos;				/* Force start here */
-      info->rc_pos=info->rc_end=info->rc_request_pos;	/* Everything used */
+      info->read_pos=info->read_end=info->request_pos;	/* Everything used */
       info->seek_not_done=1;
     }
     else
-      info->rc_pos=info->rc_end;			/* All block used */
+      info->read_pos=info->read_end;			/* All block used */
     if (!(*info->read_function)(info,buff,length))
       return 0;
     if (!(flag & READING_HEADER) || info->error == -1 ||
diff --git a/isam/_statrec.c b/isam/_statrec.c
index d93f4fe27f5..87793907da8 100644
--- a/isam/_statrec.c
+++ b/isam/_statrec.c
@@ -187,7 +187,7 @@ int _nisam_read_rnd_static_record(N_INFO *info, byte *buf,
 	(skipp_deleted_blocks || !filepos))
     {
       cache_read=1;				/* Read record using cache */
-      cache_length=(uint) (info->rec_cache.rc_end - info->rec_cache.rc_pos);
+      cache_length=(uint) (info->rec_cache.read_end - info->rec_cache.read_pos);
     }
     else
       info->rec_cache.seek_not_done=1;		/* Filepos is changed */
diff --git a/isam/test3.c b/isam/test3.c
index 935c194106d..95e1a2a68cd 100644
--- a/isam/test3.c
+++ b/isam/test3.c
@@ -172,7 +172,7 @@ void start_test(int id)
   }
   if (key_cacheing && rnd(2) == 0)
     init_key_cache(65536L,(uint) IO_SIZE*4*10);
-  printf("Process %d, pid: %d\n",id,getpid()); fflush(stdout);
+  printf("Process %d, pid: %d\n",id,(int) getpid()); fflush(stdout);
 
   for (error=i=0 ; i < tests && !error; i++)
   {
@@ -356,7 +356,7 @@ int test_write(N_INFO *file,int id,int lock_type)
       nisam_extra(file,HA_EXTRA_WRITE_CACHE);
   }
 
-  sprintf(record.id,"%7d",getpid());
+  sprintf(record.id,"%7d",(int) getpid());
   strmov(record.text,"Testing...");
 
   tries=(uint) rnd(100)+10;