1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't use symlinks when using HAVE_purify.

Browse Source 
Fix compile problem in sql_cache.cc
This commit is contained in:
monty@hundin.mysql.fi 2001-12-17 04:16:10 +02:00
parent 4dbd9e061c
commit b3fb88dc72
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sql/mysqld.cc
View File

@ -3556,7 +3556,14 @@ static void get_options(int argc,char **argv)
int c,option_index=0; int c,option_index=0;
myisam_delay_key_write=1; // Allow use of this myisam_delay_key_write=1; // Allow use of this
#ifndef HAVE_purify
my_use_symdir=1; // Use internal symbolic links 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 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?", while ((c=getopt_long(argc,argv,"ab:C:h:#::T::?l::L:O:P:sS::t:u:noVvWI?",

2
sql/sql_cache.cc
View File

@ -2160,7 +2160,9 @@ uint Query_cache::find_bin(ulong size)
} }
uint bin = steps[left].idx - uint bin = steps[left].idx -
(uint)((size - steps[left].size)/steps[left].increment); (uint)((size - steps[left].size)/steps[left].increment);
#ifndef DBUG_OFF
bins_dump(); bins_dump();
#endif
DBUG_PRINT("qcache", ("bin %u step %u, size %lu step size %lu", DBUG_PRINT("qcache", ("bin %u step %u, size %lu step size %lu",
bin, left, size, steps[left].size)); bin, left, size, steps[left].size));
DBUG_RETURN(bin); DBUG_RETURN(bin);