1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix build of mgm client with history - caught by pb.

Browse Source 
storage/ndb/src/mgmclient/main.cpp:
  fix build issues only caught by pb (mgm client history related)
This commit is contained in:
unknown 2007-06-14 11:59:25 +10:00
parent 29987e6e29
commit cb9817cc23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
storage/ndb/src/mgmclient/main.cpp
View File

@ -23,6 +23,8 @@ extern "C" {
#elif !defined(__NETWARE__) #elif !defined(__NETWARE__)
#include <readline/readline.h> #include <readline/readline.h>
extern "C" int add_history(const char *command); /* From readline directory */ 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 #define HAVE_READLINE
#endif #endif
} }
@ -158,6 +160,7 @@ int main(int argc, char** argv){
BaseString histfile; BaseString histfile;
if (!opt_execute_str) if (!opt_execute_str)
{ {
#ifdef HAVE_READLINE
char *histfile_env= getenv("NDB_MGM_HISTFILE"); char *histfile_env= getenv("NDB_MGM_HISTFILE");
if (histfile_env) if (histfile_env)
histfile.assign(histfile_env,strlen(histfile_env)); histfile.assign(histfile_env,strlen(histfile_env));
@ -168,10 +171,12 @@ int main(int argc, char** argv){
} }
if (histfile.length()) if (histfile.length())
read_history(histfile.c_str()); read_history(histfile.c_str());
#endif
ndbout << "-- NDB Cluster -- Management Client --" << endl; ndbout << "-- NDB Cluster -- Management Client --" << endl;
while(read_and_execute(_try_reconnect)); while(read_and_execute(_try_reconnect));
#ifdef HAVE_READLINE
if (histfile.length()) if (histfile.length())
{ {
BaseString histfile_tmp; BaseString histfile_tmp;
@ -180,6 +185,7 @@ int main(int argc, char** argv){
if(!write_history(histfile_tmp.c_str())) if(!write_history(histfile_tmp.c_str()))
my_rename(histfile_tmp.c_str(), histfile.c_str(), MYF(MY_WME)); my_rename(histfile_tmp.c_str(), histfile.c_str(), MYF(MY_WME));
} }
#endif
} }
else else
{ {