Commit c9078c40 authored by unknown's avatar unknown
Browse files

Disable symlinks under valgrind builds (again), with a comment. 


sql/mysqld.cc:
  Once again, disable symlink.test under valgrind builds. symlink.test
  fails deep in mi_repair - the result of this having been disabled
  for almost 5 years.
parent eeaf11b2

sql/mysqld.cc

+13 −2
Original line number Diff line number Diff line
@@ -67,6 +67,12 @@ 
#define ONE_THREAD

#endif



#ifdef HAVE_purify

#define IF_PURIFY(A,B) (A)

#else

#define IF_PURIFY(A,B) (B)

#endif



#if SIZEOF_CHARP == 4

#define MAX_MEM_TABLE_SIZE ~(ulong) 0

#else
@@ -5428,7 +5434,7 @@ log and this option does nothing anymore.", 
#endif

  {"symbolic-links", 's', "Enable symbolic link support.",

   (gptr*) &my_use_symdir, (gptr*) &my_use_symdir, 0, GET_BOOL, NO_ARG,

   1, 0, 0, 0, 0, 0},

   IF_PURIFY(0,1), 0, 0, 0, 0, 0},

  {"sysdate-is-now", OPT_SYSDATE_IS_NOW,

   "Non-default option to alias SYSDATE() to NOW() to make it safe-replicable. Since 5.0, SYSDATE() returns a `dynamic' value different for different invocations, even within the same statement.",

   (gptr*) &global_system_variables.sysdate_is_now,
@@ -5460,7 +5466,12 @@ log and this option does nothing anymore.", 
   0, 0, 0, 0, 0},

  {"use-symbolic-links", 's', "Enable symbolic link support. Deprecated option; use --symbolic-links instead.",

   (gptr*) &my_use_symdir, (gptr*) &my_use_symdir, 0, GET_BOOL, NO_ARG,

   1, 0, 0, 0, 0, 0},

   /*

     The system call realpath() produces warnings under valgrind and

     purify. These are not suppressed: instead we disable symlinks

     option if compiled with valgrind support. 

   */

   IF_PURIFY(0,1), 0, 0, 0, 0, 0},

  {"user", 'u', "Run mysqld daemon as user.", 0, 0, 0, GET_STR, REQUIRED_ARG,

   0, 0, 0, 0, 0, 0},

  {"verbose", 'v', "Used with --help option for detailed help",