bk commit into 5.1 tree (stewart:1.2544)

[Stewart Smith]

Below is the list of changes that have just been committed into a local
5.1 repository of stewart. When stewart does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-06-14 11:59:25+10:00, stewart@willster.(none) +1 -0
  fix build of mgm client with history - caught by pb.

  storage/ndb/src/mgmclient/main.cpp@stripped, 2007-06-14 11:59:21+10:00,
stewart@willster.(none) +6 -0
    fix build issues only caught by pb (mgm client history related)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	stewart
# Host:	willster.(none)
# Root:	/home/stewart/Documents/MySQL/5.1/ndb-work

--- 1.31/storage/ndb/src/mgmclient/main.cpp	2007-05-11 20:57:22 +10:00
+++ 1.32/storage/ndb/src/mgmclient/main.cpp	2007-06-14 11:59:21 +10:00
@@ -23,6 +23,8 @@
 #elif !defined(__NETWARE__)
 #include <readline/readline.h>
 extern "C" int add_history(const char *command); /* From readline directory */
+extern "C" int read_history(const char *command);
+extern "C" int write_history(const char *command);
 #define HAVE_READLINE
 #endif
 }
@@ -158,6 +160,7 @@
   BaseString histfile;
   if (!opt_execute_str)
   {
+#ifdef HAVE_READLINE
     char *histfile_env= getenv("NDB_MGM_HISTFILE");
     if (histfile_env)
       histfile.assign(histfile_env,strlen(histfile_env));
@@ -168,10 +171,12 @@
     }
     if (histfile.length())
       read_history(histfile.c_str());
+#endif
 
     ndbout << "-- NDB Cluster -- Management Client --" << endl;
     while(read_and_execute(_try_reconnect));
 
+#ifdef HAVE_READLINE
     if (histfile.length())
     {
       BaseString histfile_tmp;
@@ -180,6 +185,7 @@
       if(!write_history(histfile_tmp.c_str()))
         my_rename(histfile_tmp.c_str(), histfile.c_str(), MYF(MY_WME));
     }
+#endif
   }
   else
   {