After merge fix.

0cb0ae35 · ram@gw.mysql.r18.ru · 3640843a · 0cb0ae35
Commit 0cb0ae35 authored Sep 08, 2004 by ram@gw.mysql.r18.ru
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/mysqld.cc sql/mysqld.cc +1 -1

No files found.
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -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)