summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index d602c44c8f9..4f58ff33f04 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -2361,9 +2361,8 @@ Now disabling --log-slave-updates.");
{
if (global_system_variables.log_warnings)
sql_print_error("Warning: Failed to lock memory. Errno: %d\n",errno);
+ locked_in_memory= 0;
}
- else
- locked_in_memory=1;
}
#else
locked_in_memory=0;