From 0cb0ae35b637b0c8883ef253dcfa91387c1f54eb Mon Sep 17 00:00:00 2001
From: "ram@gw.mysql.r18.ru" <>
Date: Wed, 8 Sep 2004 17:38:57 +0500
Subject: [PATCH] After merge fix.

---
 sql/mysqld.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index d978069a823..c59f1ddcad6 100644
--- 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)