Commit 4aa69fd5 authored by monty@bitch.mysql.fi's avatar monty@bitch.mysql.fi
Browse files

Merge hundin:/my/mysql-4.0 into bitch.mysql.fi:/my/mysql-4.0

parents e947c95f 7d6e8ee7

Docs/manual.texi

+0 −4
Original line number Diff line number Diff line
@@ -46988,10 +46988,6 @@ Apache authentication module for MySQL. By Zeev Suraski, 
@c registering information is only used for statistical purposes and will

@c encourage further development of this module!













@item @uref{http://www.mysql.com/Downloads/Contrib/mod_log_mysql-1.05.tar.gz}













MySQL logging module for Apache. By Zeev Suraski,













@email{bourbon@@netvision.net.il}.



























@item @uref{http://www.mysql.com/Downloads/Contrib/mypasswd-2.0.tar.gz}















Extra for @code{mod_auth_mysql}. This is a little tool that allows you















to add/change user records storing group and/or password entries in

























Docs/mirrors.texi



+0
−4






























Original line number
Diff line number
Diff line








@@ -138,10 +138,6 @@ WWW (@uref{http://mysql.oms-net.nl/})













@image{Flags/netherlands} Netherlands [ProServe] @@















WWW (@uref{http://mysql.proserve.nl/})





























@item













@image{Flags/netherlands} Netherlands [Silverpoint] @@













WWW (@uref{http://mysql.silverpoint.nl/})





























@item















@image{Flags/netherlands} Netherlands [WideXS BV] @@















WWW (@uref{http://mysql.mirror.widexs.nl/})

































sql/mysqld.cc



+7
−0






























Original line number
Diff line number
Diff line








@@ -3556,7 +3556,14 @@ static void get_options(int argc,char **argv)













  int c,option_index=0;































  myisam_delay_key_write=1;			// Allow use of this













#ifndef HAVE_purify















  my_use_symdir=1;				// Use internal symbolic links













#else













  /* Symlinks gives too many warnings with purify */













  my_disable_symlinks=1;













  my_use_symdir=0;













  have_symlink=SHOW_OPTION_DISABLED;













#endif































  optind = 0;   // setup in case getopt() was called previously















  while ((c=getopt_long(argc,argv,"ab:C:h:#::T::?l::L:O:P:sS::t:u:noVvWI?",

































sql/sql_cache.cc



+2
−0






























Original line number
Diff line number
Diff line








@@ -2160,7 +2160,9 @@ uint Query_cache::find_bin(ulong size)













  }















  uint bin =  steps[left].idx - 















    (uint)((size - steps[left].size)/steps[left].increment);













#ifndef DBUG_OFF















  bins_dump();













#endif















  DBUG_PRINT("qcache", ("bin %u step %u, size %lu step size %lu",















			bin, left, size, steps[left].size));















  DBUG_RETURN(bin);