Commit 9b1a3343 authored by unknown's avatar unknown
Browse files

After merge fix. 


sql/mysqld.cc:
  mlockall() call hided behind !defined(EMBEDDED_LIBRARY).
parent e5af92b0

sql/mysqld.cc

+1 −1
Original line number Diff line number Diff line
@@ -2654,7 +2654,7 @@ server."); 
  /* We must set dflt_key_cache in case we are using ISAM tables */

  dflt_key_cache= sql_key_cache;



#if defined(HAVE_MLOCKALL) && defined(MCL_CURRENT)

#if defined(HAVE_MLOCKALL) && defined(MCL_CURRENT) && !defined(EMBEDDED_LIBRARY)

  if (locked_in_memory && !getuid())

  {

    if (seteuid(0) == -1)