Commit 77ee990b authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Cleanups

parent 6f767647

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -400,3 +400,4 @@ vio/test-sslclient 
vio/test-sslserver

vio/viotest-ssl

tools/mysqlmanager

vio/test-ssl

Docs/manual.texi

+0 −5
Original line number Diff line number Diff line
@@ -42382,11 +42382,6 @@ interface that is based on msqltcl 1.50. 
The MySQL @uref{http://www.mysql.com/Downloads/Contrib/,Contrib directory}

contains an Eiffel wrapper written by Michael Ravits.













You can also find this at:













@url{http://www.netpedia.net/hosting/newplayer/}

































































@node Extending MySQL, Problems, Clients, Top















@chapter Extending MySQL

























isam/isamchk.c



+4
−4






























Original line number
Diff line number
Diff line








@@ -62,7 +62,7 @@ SET_STACK_SIZE(9000)			/* Minimum stack size for program */













#define MIN_SORT_BUFFER		(4096-MALLOC_OVERHEAD)















#endif





























#define NEAD_MEM	((uint) 10*4*(IO_SIZE+32)+32) /* Nead for recursion */













#define NEED_MEM	((uint) 10*4*(IO_SIZE+32)+32) /* Nead for recursion */















#define MAXERR			20















#define BUFFERS_WHEN_SORTING	16		/* Alloc for sort-key-tree */















#define WRITE_COUNT		MY_HOW_OFTEN_TO_WRITE










@@ -512,7 +512,7 @@ static int nisamchk(my_string filename)













      if (!rep_quick)















      {















	if (testflag & T_EXTEND)













	  VOID(init_key_cache(use_buffers,(uint) NEAD_MEM));













	  VOID(init_key_cache(use_buffers,(uint) NEED_MEM));















	VOID(init_io_cache(&read_cache,datafile,(uint) read_buffer_length,















			  READ_CACHE,share->pack.header_length,1,















			  MYF(MY_WME)));










@@ -1473,7 +1473,7 @@ my_string name;













    printf("Data records: %lu\n",(ulong) share->state.records);















  }





























  VOID(init_key_cache(use_buffers,NEAD_MEM));













  VOID(init_key_cache(use_buffers,NEED_MEM));















  if (init_io_cache(&read_cache,info->dfile,(uint) read_buffer_length,















		   READ_CACHE,share->pack.header_length,1,MYF(MY_WME)))















    goto err;










@@ -1950,7 +1950,7 @@ int write_info;













  if (share->state.key_root[sort_key] == NI_POS_ERROR)















    DBUG_RETURN(0);				/* Nothing to do */





























  init_key_cache(use_buffers,NEAD_MEM);













  init_key_cache(use_buffers,NEED_MEM);















  if (init_io_cache(&info->rec_cache,-1,(uint) write_buffer_length,















		   WRITE_CACHE,share->pack.header_length,1,















		   MYF(MY_WME | MY_WAIT_IF_FULL)))

































myisam/mi_check.c



+1
−1






























Original line number
Diff line number
Diff line








@@ -1130,7 +1130,7 @@ int mi_repair(MI_CHECK *param, register MI_INFO *info,













  }































  if (!param->using_global_keycache)













    VOID(init_key_cache(param->use_buffers,NEAD_MEM));













    VOID(init_key_cache(param->use_buffers,NEED_MEM));































  if (init_io_cache(&param->read_cache,info->dfile,















		    (uint) param->read_buffer_length,

































myisam/myisamchk.c



+2
−2






























Original line number
Diff line number
Diff line








@@ -778,7 +778,7 @@ static int myisamchk(MI_CHECK *param, my_string filename)













	  !(param->testflag & (T_FAST | T_FORCE_CREATE)))















      {















	if (param->testflag & (T_EXTEND | T_MEDIUM))













	  VOID(init_key_cache(param->use_buffers,(uint) NEAD_MEM));













	  VOID(init_key_cache(param->use_buffers,(uint) NEED_MEM));















	VOID(init_io_cache(&param->read_cache,datafile,















			   (uint) param->read_buffer_length,















			   READ_CACHE,










@@ -1185,7 +1185,7 @@ static int mi_sort_records(MI_CHECK *param,













  if (share->state.key_root[sort_key] == HA_OFFSET_ERROR)















    DBUG_RETURN(0);				/* Nothing to do */





























  init_key_cache(param->use_buffers,NEAD_MEM);













  init_key_cache(param->use_buffers,NEED_MEM);















  if (init_io_cache(&info->rec_cache,-1,(uint) param->write_buffer_length,















		   WRITE_CACHE,share->pack.header_length,1,















		   MYF(MY_WME | MY_WAIT_IF_FULL)))