From 10b89ff5e7dddce8f775ffe7ce7833d303254b29 Mon Sep 17 00:00:00 2001 From: unknown <monty@hundin.mysql.fi> Date: Mon, 17 Dec 2001 04:16:10 +0200 Subject: [PATCH] Don't use symlinks when using HAVE_purify. Fix compile problem in sql_cache.cc sql/mysqld.cc: Don't use symlinks if you are using HAVE_purify sql/sql_cache.cc: Don't call bins_dump() when not debugging. --- sql/mysqld.cc | 7 +++++++ sql/sql_cache.cc | 2 ++ 2 files changed, 9 insertions(+) diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 60dd45bc1f..ab7c68f074 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -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?", diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index c4dc56620d..8364373730 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -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); -- 2.30.9