After merge fix.

This commit is contained in:
ram@gw.mysql.r18.ru 2004-09-08 17:38:57 +05:00
parent 3640843a8b
commit 0cb0ae35b6

View file

@ -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)