From cb3df6f2e9f286fceca4a4a0e125642e52baf342 Mon Sep 17 00:00:00 2001
From: unknown <evgen@moonbone.local>
Date: Thu, 2 Aug 2007 23:08:52 +0400
Subject: [PATCH] mysqld.cc:   Post merge changes.

sql/mysqld.cc:
  Post merge changes.
---
 sql/mysqld.cc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 7fa13fe127f..50d5633ed88 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -5071,8 +5071,7 @@ enum options_mysqld
   OPT_PLUGIN_DIR,
   OPT_LOG_OUTPUT,
   OPT_PORT_OPEN_TIMEOUT,
-  OPT_SECURE_FILE_PRIV,
-  OPT_KEEP_FILES_ON_CREATE
+  OPT_KEEP_FILES_ON_CREATE,
   OPT_GENERAL_LOG,
   OPT_SLOW_LOG,
   OPT_THREAD_HANDLING,
@@ -5945,8 +5944,8 @@ log and this option does nothing anymore.",
    IO_SIZE, 0},
   {"keep_files_on_create", OPT_KEEP_FILES_ON_CREATE,
    "Don't overwrite stale .MYD and .MYI even if no directory is specified.",
-   (gptr*) &global_system_variables.keep_files_on_create,
-   (gptr*) &max_system_variables.keep_files_on_create,
+   (uchar**) &global_system_variables.keep_files_on_create,
+   (uchar**) &max_system_variables.keep_files_on_create,
    0, GET_BOOL, OPT_ARG, 0, 0, 0, 0, 0, 0},
   {"key_buffer_size", OPT_KEY_BUFFER_SIZE,
    "The size of the buffer used for index blocks for MyISAM tables. Increase this to get better index handling (for all reads and multiple writes) to as much as you can afford; 64M on a 256M machine that mainly runs MySQL is quite common.",