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

Don't use symlinks when using HAVE_purify. 

Fix compile problem in sql_cache.cc
parent 4dbd9e06

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);