Merge lp:~vjsamuel/drizzle/refactor-drizzle into lp:~drizzle-trunk/drizzle/development

[Vijay Samuel]

[Jay Pipes (jaypipes)]

Hi Vijay!

Great work on refactoring the client to use program_options! It's great to see the use of mysys (drizzled::internal::) removed here.

Most of my comments are about naming and style. I've noticed you're a bit inconsistent in that area, so I'll try to point out a few things that need fixed :)

1)

put one and only one space between if|else|else if and the left parentheses.
put one space before and one space after comparison operators (==, !=, >, >=, etc)
put one space after negation operators (use if (! some_bool) or if (not some_bool))

You use a mix of a number of styles. For instance:

118 + if(in_connect_timeout>3600*12)
129 + if( in_max_input_line<4096 || in_max_input_line>(int64_t)2*1024L*1024L*1024L)
140 + if (s.find("--password")==0)
154 + if(s.substr(10)=="=")

Please go through and make sure you follow the style guidelines regarding proper spacing :)

Also, please be consistent in comment spacing...you use both this:

144 + //check if no argument is passed.
and
62 + // check if --password has quotes, remove quotes and return the value

Please use a space between // and the start of the comment

2.

Consider renaming the reg_password() function to something more descriptive, and placing a comment block before the function to indicate *why* that function exists and what it's doing so that developers hacking on the client can properly avoid all the pain you worked hard with Monty to work through! :)

Cheers!
jay

review: Needs Fixing

[Monty Taylor (mordred)]

Mentioned on IRC, but for the record:

  error=sql_connect((char *)current_host.c_str(), (char *)current_db.c_str(), (char *)current_user.c_str(), (char *)opt_password.c_str(),0);

it might be nicer to change the sql_connect function to take arguments of const string& for host, db and current_user.

review: Needs Fixing

[lp:~vjsamuel/drizzle/refactor-drizzle]

1583. By Vijay Samuel <vijay@vijay> on 2010-06-03

Merge patch for sql_connect() and style issue.

[Stewart Smith (stewart)]

On Thu, 03 Jun 2010 10:41:05 -0000, Vijay Samuel <email address hidden> wrote:
> + return make_pair("password", "☃PASSWORD☃");

snowman? special characters probably shouldn't be in source.

--
Stewart Smith

[Monty Taylor (mordred)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 06/03/2010 04:10 PM, Stewart Smith wrote:
> On Thu, 03 Jun 2010 10:41:05 -0000, Vijay Samuel <email address hidden> wrote:
>> + return make_pair("password", "☃PASSWORD☃");
>
> snowman? special characters probably shouldn't be in source.

We needed a sentinel string that was very unlikely to actually be used
in a password string. (side effect to how the program_options works) ...
This is our work around to mark the option as "didn't provide an option
- - please prompt for password"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkwIQKMACgkQ2Jv7/VK1RgE87gCghfiHJ1+1tmhpZYg+kXdmPACv
GjMAoMV/0x9mvIEwhP9CBfm/JbXih64b
=QFpi
-----END PGP SIGNATURE-----

[lp:~vjsamuel/drizzle/refactor-drizzle]

1584. By Vijay Samuel <vijay@vijay> on 2010-06-04

Merge fix for additional parser for --password.

Unmerged revisions

=== modified file 'client/drizzle.cc' (properties changed: +x to -x)
--- client/drizzle.cc	2010-05-25 15:23:24 +0000
+++ client/drizzle.cc	2010-06-03 17:20:45 +0000
@@ -37,6 +37,7 @@
 #include <string>
 #include <drizzled/gettext.h>
 #include <iostream>
+#include <fstream>
 #include <map>
 #include <algorithm>
 #include <limits.h>
@@ -139,9 +140,11 @@
 #undef vidattr
 #define vidattr(A) {}      // Can't get this to work
 #endif
+#include <boost/program_options.hpp>
 
 using namespace drizzled;
 using namespace std;
+namespace po=boost::program_options;
 
 const string VER("14.14");
 /* Don't try to make a nice table if the data is too big */
@@ -151,7 +154,6 @@
 const int MAX_SERVER_VERSION_LENGTH= 128;
 
 #define PROMPT_CHAR '\\'
-#define DEFAULT_DELIMITER ";"
 
 class Status
 {
@@ -260,7 +262,6 @@
 static map<string, string> completion_map;
 static string completion_string;
 
-static char **defaults_argv;
 
 enum enum_info_type { INFO_INFO,INFO_ERROR,INFO_RESULT};
 typedef enum enum_info_type INFO_TYPE;
@@ -279,15 +280,14 @@
   default_pager_set= false, opt_sigint_ignore= false,
   auto_vertical_output= false,
   show_warnings= false, executing_query= false, interrupted_query= false,
-  opt_mysql= false;
-static uint32_t  show_progress_size= 0;
+  opt_mysql= false, opt_local_infile;
+static uint32_t show_progress_size= 0;
 static bool column_types_flag;
 static bool preserve_comments= false;
-static uint32_t opt_max_input_line, opt_drizzle_port= 0;
-static int verbose= 0, opt_silent= 0, opt_local_infile= 0;
+static uint32_t opt_max_input_line;
+static uint32_t opt_drizzle_port= 0;
+static int  opt_silent, verbose= 0;
 static drizzle_capabilities_t connect_flag= DRIZZLE_CAPABILITIES_NONE;
-static char *current_host, *current_db, *current_user= NULL,
-  *opt_password= NULL, *delimiter_str= NULL, *current_prompt= NULL;
 static char *histfile;
 static char *histfile_tmp;
 static string *glob_buffer;
@@ -298,6 +298,14 @@
 static uint32_t select_limit;
 static uint32_t max_join_size;
 static uint32_t opt_connect_timeout= 0;
+std::string current_db,
+  delimiter_str,  
+  current_host,
+  current_prompt,
+  current_user,
+  opt_verbose,
+  current_password,
+  opt_password;
 // TODO: Need to i18n these
 static const char *day_names[]= {"Sun","Mon","Tue","Wed","Thu","Fri","Sat"};
 static const char *month_names[]= {"Jan","Feb","Mar","Apr","May","Jun","Jul",
@@ -306,7 +314,7 @@
 static char pager[FN_REFLEN], outfile[FN_REFLEN];
 static FILE *PAGER, *OUTFILE;
 static uint32_t prompt_counter;
-static char delimiter[16]= DEFAULT_DELIMITER;
+static char *delimiter= NULL;
 static uint32_t delimiter_length= 1;
 unsigned short terminal_width= 80;
 
@@ -324,7 +332,7 @@
 void tee_putc(int c, FILE *file);
 static void tee_print_sized_data(const char *, unsigned int, unsigned int, bool);
 /* The names of functions that actually do the manipulation. */
-static int get_options(int argc,char **argv);
+static int process_options(void);
 static int com_quit(string *str,const char*),
   com_go(string *str,const char*), com_ego(string *str,const char*),
   com_print(string *str,const char*),
@@ -338,7 +346,7 @@
   com_nopager(string *str, const char*), com_pager(string *str, const char*);
 
 static int read_and_execute(bool interactive);
-static int sql_connect(char *host,char *database,char *user,char *password,
+static int sql_connect(const string &host, const string &database, const string &user, const string &password,
                        uint32_t silent);
 static const char *server_version_string(drizzle_con_st *con);
 static int put_info(const char *str,INFO_TYPE info,uint32_t error,
@@ -1157,7 +1165,6 @@
   Commands((char *)NULL,       0, 0, 0, "")
 };
 
-static const char *load_default_groups[]= { "drizzle","client",0 };
 
 int history_length;
 static int not_in_history(const char *line);
@@ -1300,8 +1307,71 @@
   return executed;
 }
 
+static void check_timeout_value(uint32_t in_connect_timeout)
+{
+  opt_connect_timeout= 0;
+  if (in_connect_timeout > 3600*12)
+  {
+    cout<<N_("Error: Invalid Value for connect_timeout"); 
+    exit(-1);
+  }
+  opt_connect_timeout= in_connect_timeout;
+}
+
+static void check_max_input_line(uint32_t in_max_input_line)
+{
+  opt_max_input_line= 0;
+  if (in_max_input_line<4096 || in_max_input_line>(int64_t)2*1024L*1024L*1024L)
+  {
+    cout<<N_("Error: Invalid Value for max_input_line");
+    exit(-1);
+  }
+  opt_max_input_line= in_max_input_line/1024;
+  opt_max_input_line*=1024;
+}
+
+static pair<string, string> parse_password_arg(std::string s)
+{
+  if (s.find("--password") == 0)
+  {
+    if (s == "--password")
+    {
+      // Check if no argument is passed.
+      return make_pair("password", "☃PASSWORD☃");
+    }
+
+    if (s.substr(10,3) == "=\"\"")
+    {
+      // Check if --password=""
+      return make_pair("password","☃PASSWORD☃");
+    }
+    
+    if (s.substr(10) == "=")
+    {
+      // check if --password= and return a default value
+      return make_pair("password","☃PASSWORD☃");
+    }
+
+    if (s.length()>12 && s[10] == '\"')
+    {
+      // check if --password has quotes, remove quotes and return the value
+      return make_pair("password", s.substr(11,s.length()-1));
+    }
+
+    // if all above are false, it implies that --password=value, return value.
+    return make_pair("password", s.substr(11));
+  }
+
+  else
+  {
+    return make_pair(string(""), string(""));
+  } 
+}
+
 int main(int argc,char *argv[])
 {
+try
+{
 #if defined(ENABLE_NLS)
 # if defined(HAVE_LOCALE_H)
   setlocale(LC_ALL, "");
@@ -1310,12 +1380,160 @@
   textdomain("drizzle");
 #endif
 
-  MY_INIT(argv[0]);
-  delimiter_str= delimiter;
+  po::options_description commandline_options("Options used only in command line");
+  commandline_options.add_options()
+  ("help,?",N_("Displays this help and exit."))
+  ("batch,B",N_("Don't use history file. Disable interactive behavior. (Enables --silent)"))
+  ("column-type-info", po::value<bool>(&column_types_flag)->default_value(false)->zero_tokens(),
+  N_("Display column type information."))
+  ("comments,c", po::value<bool>(&preserve_comments)->default_value(false)->zero_tokens(),
+  N_("Preserve comments. Send comments to the server. The default is --skip-comments (discard comments), enable with --comments"))
+  ("compress,C", po::value<bool>(&opt_compress)->default_value(false)->zero_tokens(),
+  N_("Use compression in server/client protocol."))  
+  ("vertical,E", po::value<bool>(&vertical)->default_value(false)->zero_tokens(),
+  N_("Print the output of a query (rows) vertically."))
+  ("force,f", po::value<bool>(&ignore_errors)->default_value(false)->zero_tokens(),
+  N_("Continue even if we get an sql error."))
+  ("named-commands,G", po::value<bool>(&named_cmds)->default_value(false)->zero_tokens(),
+  N_("Enable named commands. Named commands mean this program's internal commands; see drizzle> help . When enabled, the named commands can be used from any line of the query, otherwise only from the first line, before an enter. Disable with --disable-named-commands. This option is disabled by default."))
+  ("no-named-commands,g",
+  N_("Named commands are disabled. Use \\* form only, or use named commands only in the beginning of a line ending with a semicolon (;) Since version 10.9 the client now starts with this option ENABLED by default! Disable with '-G'. Long format commands still work from the first line. WARNING: option deprecated; use --disable-named-commands instead."))
+  ("ignore-spaces,i", N_("Ignore space after function names."))
+  ("no-beep,b", po::value<bool>(&opt_nobeep)->default_value(false)->zero_tokens(),
+  N_("Turn off beep on error."))
+  ("line-numbers", po::value<bool>(&line_numbers)->default_value(true)->zero_tokens(),
+  N_("Write line numbers for errors."))
+  ("skip-line-numbers,L", 
+  N_("Don't write line number for errors. WARNING: -L is deprecated, use long version of this option instead."))
+  ("column-name", po::value<bool>(&column_names)->default_value(true)->zero_tokens(),
+  N_("Write column names in results."))
+  ("skip-column-names,N", 
+  N_("Don't write column names in results. WARNING: -N is deprecated, use long version of this options instead."))
+  ("set-variable,O", po::value<string>(),
+  N_("Change the value of a variable. Please note that this option is deprecated; you can set variables directly with --variable-name=value."))
+  ("table,t", po::value<bool>(&output_tables)->default_value(false)->zero_tokens(),
+  N_("Output in table format.")) 
+  ("safe-updates,U", po::value<bool>(&safe_updates)->default_value(0)->zero_tokens(),
+  N_("Only allow UPDATE and DELETE that uses keys."))
+  ("i-am-a-dummy,U", po::value<bool>(&safe_updates)->default_value(0)->zero_tokens(),
+  N_("Synonym for option --safe-updates, -U."))
+  ("verbose,v", po::value<string>(&opt_verbose)->default_value(""),
+  N_("-v vvv implies that verbose= 3, Used to specify verbose"))
+  ("version,V", N_("Output version information and exit."))
+  ("secure-auth", po::value<bool>(&opt_secure_auth)->default_value(false)->zero_tokens(),
+  N_("Refuse client connecting to server if it uses old (pre-4.1.1) protocol"))
+  ("show-warnings", po::value<bool>(&show_warnings)->default_value(false)->zero_tokens(),
+  N_("Show warnings after every statement."))
+  ("show-progress-size", po::value<uint32_t>(&show_progress_size)->default_value(0),
+  N_("Number of lines before each import progress report."))
+  ("ping", po::value<bool>(&opt_ping)->default_value(false)->zero_tokens(),
+  N_("Ping the server to check if it's alive."))
+  ("no-defaults", po::value<bool>()->default_value(false)->zero_tokens(),
+  N_("Configuration file defaults are not used if no-defaults is set"))
+  ;
+
+  po::options_description drizzle_options("Options specific to the drizzle client");
+  drizzle_options.add_options()
+  ("auto-rehash", po::value<bool>(&opt_rehash)->default_value(true)->zero_tokens(),
+  N_("Enable automatic rehashing. One doesn't need to use 'rehash' to get table and field completion, but startup and reconnecting may take a longer time. Disable with --disable-auto-rehash."))
+  ("no-auto-rehash,A",N_("No automatic rehashing. One has to use 'rehash' to get table and field completion. This gives a quicker start of drizzle_st and disables rehashing on reconnect. WARNING: options deprecated; use --disable-auto-rehash instead."))
+  ("auto-vertical-output", po::value<bool>(&auto_vertical_output)->default_value(false)->zero_tokens(),
+  N_("Automatically switch to vertical output mode if the result is wider than the terminal width."))
+  ("database,D", po::value<string>(&current_db)->default_value("test"),
+  N_("Database to use."))
+  ("default-character-set",po::value<string>(),
+  N_("(not used)"))
+  ("delimiter", po::value<string>(&delimiter_str)->default_value(";"),
+  N_("Delimiter to be used."))
+  ("execute,e", po::value<string>(),
+  N_("Execute command and quit. (Disables --force and history file)"))
+  ("local-infile", po::value<bool>(&opt_local_infile)->default_value(false)->zero_tokens(),
+  N_("Enable/disable LOAD DATA LOCAL INFILE."))
+  ("unbuffered,n", po::value<bool>(&unbuffered)->default_value(false)->zero_tokens(),
+  N_("Flush buffer after each query."))
+  ("sigint-ignore", po::value<bool>(&opt_sigint_ignore)->default_value(false)->zero_tokens(),
+  N_("Ignore SIGINT (CTRL-C)"))
+  ("one-database,o", po::value<bool>(&one_database)->default_value(false)->zero_tokens(),
+  N_("Only update the default database. This is useful for skipping updates to other database in the update log."))
+  ("pager", po::value<string>(),
+  N_("Pager to use to display results. If you don't supply an option the default pager is taken from your ENV variable PAGER. Valid pagers are less, more, cat [> filename], etc. See interactive help (\\h) also. This option does not work in batch mode. Disable with --disable-pager. This option is disabled by default."))
+  ("disable-pager", po::value<bool>(&opt_nopager)->default_value(false)->zero_tokens(),
+  N_("Disable pager and print to stdout. See interactive help (\\h) also."))
+  ("prompt", po::value<string>(&current_prompt)->default_value(""),  
+  N_("Set the drizzle prompt to this value."))
+  ("quick,q", po::value<bool>(&quick)->default_value(false)->zero_tokens(),
+  N_("Don't cache result, print it row by row. This may slow down the server if the output is suspended. Doesn't use history file."))
+  ("raw,r", po::value<bool>(&opt_raw_data)->default_value(false)->zero_tokens(),
+  N_("Write fields without conversion. Used with --batch.")) 
+  ("reconnect", po::value<bool>(&opt_reconnect)->default_value(true)->zero_tokens(),
+  N_("Reconnect if the connection is lost. Disable with --disable-reconnect. This option is enabled by default."))
+  ("shutdown", po::value<bool>(&opt_shutdown)->default_value(false)->zero_tokens(),
+  N_("Shutdown the server"))
+  ("silent,s", N_("Be more silent. Print results with a tab as separator, each row on new line."))
+  ("tee", po::value<string>(),
+  N_("Append everything into outfile. See interactive help (\\h) also. Does not work in batch mode. Disable with --disable-tee. This option is disabled by default."))
+  ("disable-tee", po::value<bool>()->default_value(false)->zero_tokens(), 
+  N_("Disable outfile. See interactive help (\\h) also."))
+  ("wait,w", N_("Wait and retry if connection is down."))
+  ("connect_timeout", po::value<uint32_t>(&opt_connect_timeout)->default_value(0)->notifier(&check_timeout_value),
+  N_("Number of seconds before connection timeout."))
+  ("max_input_line", po::value<uint32_t>(&opt_max_input_line)->default_value(16*1024L*1024L)->notifier(&check_max_input_line),
+  N_("Max length of input line"))
+  ("select_limit", po::value<uint32_t>(&select_limit)->default_value(1000L),
+  N_("Automatic limit for SELECT when using --safe-updates"))
+  ("max_join_size", po::value<uint32_t>(&max_join_size)->default_value(1000000L),
+  N_("Automatic limit for rows in a join when using --safe-updates"))
+  ;
+
+  po::options_description client_options("Options specific to the client");
+  client_options.add_options()
+  ("mysql,m", po::value<bool>(&opt_mysql)->default_value(true)->zero_tokens(),
+  N_("Use MySQL Protocol."))
+  ("host,h", po::value<string>(&current_host)->default_value("localhost"),
+  N_("Connect to host"))
+  ("password,P", po::value<string>(&current_password)->default_value(""),
+  N_("Password to use when connecting to server. If password is not given it's asked from the tty."))
+  ("port,p", po::value<uint32_t>()->default_value(0),
+  N_("Port number to use for connection or 0 for default to, in order of preference, drizzle.cnf, $DRIZZLE_TCP_PORT, built-in default"))
+  ("user,u", po::value<string>(&current_user)->default_value(""),
+  N_("User for login if not current user."))
+  ("protocol",po::value<string>(),
+  N_("The protocol of connection (tcp,socket,pipe,memory)."))
+  ;
+
+  po::options_description long_options("Allowed Options");
+  long_options.add(commandline_options).add(drizzle_options).add(client_options);
+
+  std::string system_config_dir_drizzle(SYSCONFDIR); 
+  system_config_dir_drizzle.append("/drizzle/drizzle.cnf");
+
+  std::string system_config_dir_client(SYSCONFDIR); 
+  system_config_dir_client.append("/drizzle/client.cnf");
+
+  po::variables_map vm;
+
+  po::store(po::command_line_parser(argc, argv).options(long_options).extra_parser(parse_password_arg).run(), vm);
+
+  if (! vm["no-defaults"].as<bool>())
+  {
+    ifstream user_drizzle_ifs("~/.drizzle/drizzleslap.cnf");
+    po::store(parse_config_file(user_drizzle_ifs, drizzle_options), vm);
+ 
+    ifstream system_drizzle_ifs(system_config_dir_drizzle.c_str());
+    store(parse_config_file(system_drizzle_ifs, drizzle_options), vm);
+
+    ifstream user_client_ifs("~/.drizzle/client.cnf");
+    po::store(parse_config_file(user_client_ifs, client_options), vm);
+ 
+    ifstream system_client_ifs(system_config_dir_client.c_str());
+    po::store(parse_config_file(system_client_ifs, client_options), vm);
+  }
+
+  po::notify(vm);
+
   default_prompt= strdup(getenv("DRIZZLE_PS1") ?
                          getenv("DRIZZLE_PS1") :
                          "drizzle> ");
-  
   if (default_prompt == NULL)
   {
     fprintf(stderr, _("Memory allocation error while constructing initial "
@@ -1323,7 +1541,7 @@
     exit(ENOMEM);
   }
   current_prompt= strdup(default_prompt);
-  if (current_prompt == NULL)
+  if (current_prompt.empty())
   {
     fprintf(stderr, _("Memory allocation error while constructing initial "
                       "prompt. Aborting.\n"));
@@ -1344,7 +1562,7 @@
       strcpy(default_pager, tmp);
     }
   }
-  if (!isatty(0) || !isatty(1))
+  if (! isatty(0) || ! isatty(1))
   {
     status.setBatch(1); opt_silent=1;
     ignore_errors=0;
@@ -1367,18 +1585,183 @@
       close(stdout_fileno_copy);             /* Clean up dup(). */
   }
 
-  internal::load_defaults("drizzle",load_default_groups,&argc,&argv);
-  defaults_argv=argv;
-  if (get_options(argc, (char **) argv))
-  {
-    internal::free_defaults(defaults_argv);
-    internal::my_end();
+  if (vm.count("default-character-set"))
+    default_charset_used= 1;
+    
+  if (vm.count("delimiter"))
+  {
+    /* Check that delimiter does not contain a backslash */
+    if (! strstr(delimiter_str.c_str(), "\\"))
+    {
+      delimiter= (char *)delimiter_str.c_str();  
+    }
+    else
+    {
+      put_info(_("DELIMITER cannot contain a backslash character"),
+      INFO_ERROR,0,0);
+      exit(-1);
+    }
+   
+    delimiter_length= (uint32_t)strlen(delimiter);
+  }
+  if (vm.count("tee"))
+  { 
+    if (vm["tee"].as<string>().empty())
+    {
+      if (opt_outfile)
+        end_tee();
+    }
+    else
+      init_tee(vm["tee"].as<string>().c_str());
+  }
+  if (vm["disable-tee"].as<bool>() == true)
+  {
+    if (opt_outfile)
+      end_tee();
+  }
+  if (vm.count("pager"))
+  {
+    if (vm["pager"].as<string>().empty())
+      opt_nopager= 1;
+    else
+    {
+      opt_nopager= 0;
+      if (vm[pager].as<string>().length())
+      {
+        default_pager_set= 1;
+        strncpy(pager, vm["pager"].as<string>().c_str(), sizeof(pager) - 1);
+        strcpy(default_pager, pager);
+      }
+      else if (default_pager_set)
+        strcpy(pager, default_pager);
+      else
+        opt_nopager= 1;
+    }
+  }
+  if (vm.count("disable-pager"))
+  {
+    opt_nopager= 1;
+  }
+
+  if (vm.count("no-auto-rehash"))
+    opt_rehash= 0;
+
+  if (vm.count("skip-column-names"))
+    column_names= 0;
+    
+  if (vm.count("execute"))
+  {  
+    status.setBatch(1);
+    status.setAddToHistory(1);
+    if (status.getLineBuff() == NULL)
+      status.setLineBuff(opt_max_input_line,NULL);
+    if (status.getLineBuff() == NULL)
+    {
+      internal::my_end();
+      exit(1);
+    }
+    status.getLineBuff()->addString(vm["execute"].as<string>().c_str());
+  }
+
+  if (one_database)
+    skip_updates= true;
+  
+  if (vm.count("port"))
+  {
+    opt_drizzle_port= vm["port"].as<uint32_t>();
+
+    /* If the port number is > 65535 it is not a valid port
+       This also helps with potential data loss casting unsigned long to a
+       uint32_t. */
+    if ((opt_drizzle_port == 0) || (opt_drizzle_port > 65535))
+    {
+      printf(_("Error: Value of %" PRIu32 " supplied for port is not valid.\n"), opt_drizzle_port);
+      exit(-1);
+    }
+  }
+
+  if (vm.count("password"))
+  {
+    if (!opt_password.empty())
+      opt_password.erase();
+    if (current_password=="☃PASSWORD☃")
+      opt_password= "";
+    else
+      opt_password= current_password;
+    char *start= (char *)current_password.c_str();
+    char *temp_pass= (char *)current_password.c_str();
+    while (*temp_pass)
+    {
+        /* Overwriting password with 'x' */
+        *temp_pass++= 'x';
+    }
+    if (*start)
+    {
+      start[1]= 0;
+    }
+    tty_password= 0;
+  }
+  else
+  {
+      tty_password= 1;
+  }
+  
+
+  if (!opt_verbose.empty())
+  {
+    verbose= opt_verbose.length();
+  }
+
+  if (vm.count("batch"))
+  {
+    status.setBatch(1);
+    status.setAddToHistory(0);
+    set_if_bigger(opt_silent,1);                         // more silent
+  }
+  if (vm.count("silent"))
+  {
+    opt_silent++;
+  }
+  if (vm.count("version"))
+  {
+    printf(_("%s  Ver %s Distrib %s, for %s-%s (%s) using readline %s\n"),
+    internal::my_progname, VER.c_str(), drizzle_version(),
+    HOST_VENDOR, HOST_OS, HOST_CPU,
+    rl_library_version);
+
+    exit(0);
+  }
+  
+  if (vm.count("help"))
+  {
+    printf(_("%s  Ver %s Distrib %s, for %s-%s (%s) using readline %s\n"),
+    internal::my_progname, VER.c_str(), drizzle_version(),
+    HOST_VENDOR, HOST_OS, HOST_CPU,
+    rl_library_version);
+    printf(_("Copyright (C) 2008 Sun Microsystems\n"
+           "This software comes with ABSOLUTELY NO WARRANTY. "
+           "This is free software,\n"
+           "and you are welcome to modify and redistribute it "
+           "under the GPL license\n"));
+    printf(_("Usage: %s [OPTIONS] [database]\n"), internal::my_progname);
+    cout<<long_options;
+    exit(0);
+  }
+ 
+
+  if (process_options())
+  {
     exit(1);
   }
 
+  if (argc == 1)
+  {
+    skip_updates= 0;
+    current_db.erase();
+    current_db= strdup(*argv);
+  }
   memset(&drizzle, 0, sizeof(drizzle));
-  if (sql_connect(current_host,current_db,current_user,opt_password,
-                  opt_silent))
+  if (sql_connect(current_host, current_db, current_user, opt_password,opt_silent))
   {
     quick= 1;          // Avoid history
     status.setExitStatus(1);
@@ -1389,8 +1772,6 @@
   if (execute_commands(&command_error) != false)
   {
     /* we've executed a command so exit before we go into readline mode */
-    internal::free_defaults(defaults_argv);
-    internal::my_end();
     exit(command_error);
   }
 
@@ -1399,8 +1780,6 @@
     status.setLineBuff(opt_max_input_line, stdin);
     if (status.getLineBuff() == NULL)
     {
-      internal::free_defaults(defaults_argv);
-      internal::my_end();
       exit(1);
     }
   }
@@ -1436,7 +1815,7 @@
           server_version_string(&con));
   put_info(output_buff, INFO_INFO, 0, 0);
 
-  initialize_readline(current_prompt);
+  initialize_readline((char *)current_prompt.c_str());
   if (!status.getBatch() && !quick)
   {
     /* read-history from file, default ~/.drizzle_history*/
@@ -1480,7 +1859,12 @@
   if (opt_outfile)
     end_tee();
   drizzle_end(0);
+}
 
+  catch(exception &err)
+  {
+  cerr<<"Error:"<<err.what()<<endl;
+  }
   return(0);        // Keep compiler happy
 }
 
@@ -1505,18 +1889,16 @@
     delete glob_buffer;
   if (processed_prompt)
     delete processed_prompt;
-  free(opt_password);
+  opt_password.erase();
   free(histfile);
   free(histfile_tmp);
-  free(current_db);
-  free(current_host);
-  free(current_user);
+  current_db.erase();
+  current_host.erase();
+  current_user.erase();
   free(full_username);
   free(part_username);
   free(default_prompt);
-  free(current_prompt);
-  internal::free_defaults(defaults_argv);
-  internal::my_end();
+  current_prompt.erase();
   exit(status.getExitStatus());
 }
 
@@ -1539,8 +1921,8 @@
     goto err;
   }
 
-  if (drizzle_con_add_tcp(&drizzle, &kill_drizzle, current_host,
-                          opt_drizzle_port, current_user, opt_password, NULL,
+  if (drizzle_con_add_tcp(&drizzle, &kill_drizzle, current_host.c_str(),
+                          opt_drizzle_port, current_user.c_str(), opt_password.c_str(), NULL,
                           opt_mysql ? DRIZZLE_CON_MYSQL : DRIZZLE_CON_NONE) == NULL)
   {
     goto err;
@@ -1575,369 +1957,12 @@
 }
 #endif
 
-static struct option my_long_options[] =
-{
-  {"help", '?', N_("Display this help and exit."), 0, 0, 0, GET_NO_ARG, NO_ARG, 0,
-   0, 0, 0, 0, 0},
-  {"help", 'I', N_("Synonym for -?"), 0, 0, 0, GET_NO_ARG, NO_ARG, 0,
-   0, 0, 0, 0, 0},
-  {"auto-rehash", OPT_AUTO_REHASH,
-   N_("Enable automatic rehashing. One doesn't need to use 'rehash' to get table and field completion, but startup and reconnecting may take a longer time. Disable with --disable-auto-rehash."),
-   (char**) &opt_rehash, (char**) &opt_rehash, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0,
-   0, 0},
-  {"no-auto-rehash", 'A',
-   N_("No automatic rehashing. One has to use 'rehash' to get table and field completion. This gives a quicker start of drizzle_st and disables rehashing on reconnect. WARNING: options deprecated; use --disable-auto-rehash instead."),
-   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
-  {"auto-vertical-output", OPT_AUTO_VERTICAL_OUTPUT,
-   N_("Automatically switch to vertical output mode if the result is wider than the terminal width."),
-   (char**) &auto_vertical_output, (char**) &auto_vertical_output, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
-  {"batch", 'B',
-   N_("Don't use history file. Disable interactive behavior. (Enables --silent)"), 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
-  {"column-type-info", OPT_COLUMN_TYPES, N_("Display column type information."),
-   (char**) &column_types_flag, (char**) &column_types_flag,
-   0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
-  {"comments", 'c', N_("Preserve comments. Send comments to the server. The default is --skip-comments (discard comments), enable with --comments"),
-   (char**) &preserve_comments, (char**) &preserve_comments,
-   0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
-  {"compress", 'C', N_("Use compression in server/client protocol."),
-   (char**) &opt_compress, (char**) &opt_compress, 0, GET_BOOL, NO_ARG, 0, 0, 0,
-   0, 0, 0},
-  {"database", 'D', N_("Database to use."), (char**) &current_db,
-   (char**) &current_db, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-  {"default-character-set", OPT_DEFAULT_CHARSET,
-   N_("(not used)"), 0,
-   0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-  {"delimiter", OPT_DELIMITER, N_("Delimiter to be used."), (char**) &delimiter_str,
-   (char**) &delimiter_str, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-  {"execute", 'e', N_("Execute command and quit. (Disables --force and history file)"), 0,
-   0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-  {"vertical", 'E', N_("Print the output of a query (rows) vertically."),
-   (char**) &vertical, (char**) &vertical, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0,
-   0},
-  {"force", 'f', N_("Continue even if we get an sql error."),
-   (char**) &ignore_errors, (char**) &ignore_errors, 0, GET_BOOL, NO_ARG, 0, 0,
-   0, 0, 0, 0},
-  {"named-commands", 'G',
-   N_("Enable named commands. Named commands mean this program's internal commands; see drizzle> help . When enabled, the named commands can be used from any line of the query, otherwise only from the first line, before an enter. Disable with --disable-named-commands. This option is disabled by default."),
-   (char**) &named_cmds, (char**) &named_cmds, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0,
-   0, 0},
-  {"no-named-commands", 'g',
-   N_("Named commands are disabled. Use \\* form only, or use named commands only in the beginning of a line ending with a semicolon (;) Since version 10.9 the client now starts with this option ENABLED by default! Disable with '-G'. Long format commands still work from the first line. WARNING: option deprecated; use --disable-named-commands instead."),
-   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
-  {"ignore-spaces", 'i', N_("Ignore space after function names."), 0, 0, 0,
-   GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
-  {"local-infile", OPT_LOCAL_INFILE, N_("Enable/disable LOAD DATA LOCAL INFILE."),
-   (char**) &opt_local_infile,
-   (char**) &opt_local_infile, 0, GET_BOOL, OPT_ARG, 0, 0, 0, 0, 0, 0},
-  {"no-beep", 'b', N_("Turn off beep on error."), (char**) &opt_nobeep,
-   (char**) &opt_nobeep, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
-  {"host", 'h', N_("Connect to host."), (char**) &current_host,
-   (char**) &current_host, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-  {"line-numbers", OPT_LINE_NUMBERS, N_("Write line numbers for errors."),
-   (char**) &line_numbers, (char**) &line_numbers, 0, GET_BOOL,
-   NO_ARG, 1, 0, 0, 0, 0, 0},
-  {"skip-line-numbers", 'L', N_("Don't write line number for errors. WARNING: -L is deprecated, use long version of this option instead."), 0, 0, 0, GET_NO_ARG,
-   NO_ARG, 0, 0, 0, 0, 0, 0},
-  {"unbuffered", 'n', N_("Flush buffer after each query."), (char**) &unbuffered,
-   (char**) &unbuffered, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
-  {"column-names", OPT_COLUMN_NAMES, N_("Write column names in results."),
-   (char**) &column_names, (char**) &column_names, 0, GET_BOOL,
-   NO_ARG, 1, 0, 0, 0, 0, 0},
-  {"skip-column-names", 'N',
-   N_("Don't write column names in results. WARNING: -N is deprecated, use long version of this options instead."),
-   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
-  {"set-variable", 'O',
-   N_("Change the value of a variable. Please note that this option is deprecated; you can set variables directly with --variable-name=value."),
-   0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-  {"sigint-ignore", OPT_SIGINT_IGNORE, N_("Ignore SIGINT (CTRL-C)"),
-   (char**) &opt_sigint_ignore,  (char**) &opt_sigint_ignore, 0, GET_BOOL,
-   NO_ARG, 0, 0, 0, 0, 0, 0},
-  {"one-database", 'o',
-   N_("Only update the default database. This is useful for skipping updates to other database in the update log."),
-   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
-  {"pager", OPT_PAGER,
-   N_("Pager to use to display results. If you don't supply an option the default pager is taken from your ENV variable PAGER. Valid pagers are less, more, cat [> filename], etc. See interactive help (\\h) also. This option does not work in batch mode. Disable with --disable-pager. This option is disabled by default."),
-   0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
-  {"no-pager", OPT_NOPAGER,
-   N_("Disable pager and print to stdout. See interactive help (\\h) also. WARNING: option deprecated; use --disable-pager instead."),
-   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
-  {"password", 'P',
-   N_("Password to use when connecting to server. If password is not given it's asked from the tty."),
-   0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
-  {"port", 'p', N_("Port number to use for connection or 0 for default to, in order of preference, drizzle.cnf, $DRIZZLE_TCP_PORT, ")
-   N_("built-in default") " (" STRINGIFY_ARG(DRIZZLE_PORT) ").",
-   0, 0, 0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-  {"prompt", OPT_PROMPT, N_("Set the drizzle prompt to this value."),
-   (char**) &current_prompt, (char**) &current_prompt, 0, GET_STR_ALLOC,
-   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-  {"quick", 'q',
-   N_("Don't cache result, print it row by row. This may slow down the server if the output is suspended. Doesn't use history file."),
-   (char**) &quick, (char**) &quick, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
-  {"raw", 'r', N_("Write fields without conversion. Used with --batch."),
-   (char**) &opt_raw_data, (char**) &opt_raw_data, 0, GET_BOOL, NO_ARG, 0, 0, 0,
-   0, 0, 0},
-  {"reconnect", OPT_RECONNECT, N_("Reconnect if the connection is lost. Disable with --disable-reconnect. This option is enabled by default."),
-   (char**) &opt_reconnect, (char**) &opt_reconnect, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
-  {"shutdown", OPT_SHUTDOWN, N_("Shutdown the server."),
-   (char**) &opt_shutdown, (char**) &opt_shutdown, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
-  {"silent", 's', N_("Be more silent. Print results with a tab as separator, each row on new line."), 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0,
-   0, 0},
-  {"table", 't', N_("Output in table format."), (char**) &output_tables,
-   (char**) &output_tables, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
-  {"tee", OPT_TEE,
-   N_("Append everything into outfile. See interactive help (\\h) also. Does not work in batch mode. Disable with --disable-tee. This option is disabled by default."),
-   0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-  {"no-tee", OPT_NOTEE, N_("Disable outfile. See interactive help (\\h) also. WARNING: option deprecated; use --disable-tee instead"), 0, 0, 0, GET_NO_ARG,
-   NO_ARG, 0, 0, 0, 0, 0, 0},
-  {"user", 'u', N_("User for login if not current user."), (char**) &current_user,
-   (char**) &current_user, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-  {"safe-updates", 'U', N_("Only allow UPDATE and DELETE that uses keys."),
-   (char**) &safe_updates, (char**) &safe_updates, 0, GET_BOOL, NO_ARG, 0, 0,
-   0, 0, 0, 0},
-  {"i-am-a-dummy", 'U', N_("Synonym for option --safe-updates, -U."),
-   (char**) &safe_updates, (char**) &safe_updates, 0, GET_BOOL, NO_ARG, 0, 0,
-   0, 0, 0, 0},
-  {"verbose", 'v', N_("Write more. (-v -v -v gives the table output format)."), 0,
-   0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
-  {"version", 'V', N_("Output version information and exit."), 0, 0, 0,
-   GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
-  {"wait", 'w', N_("Wait and retry if connection is down."), 0, 0, 0, GET_NO_ARG,
-   NO_ARG, 0, 0, 0, 0, 0, 0},
-  {"connect_timeout", OPT_CONNECT_TIMEOUT,
-   N_("Number of seconds before connection timeout."),
-   (char**) &opt_connect_timeout,
-   (char**) &opt_connect_timeout, 0, GET_UINT32, REQUIRED_ARG, 0, 0, 3600*12, 0,
-   0, 0},
-  {"max_input_line", OPT_MAX_INPUT_LINE,
-   N_("Max length of input line"),
-   (char**) &opt_max_input_line, (char**) &opt_max_input_line, 0,
-   GET_UINT32, REQUIRED_ARG, 16 *1024L*1024L, 4096,
-   (int64_t) 2*1024L*1024L*1024L, MALLOC_OVERHEAD, 1024, 0},
-  {"select_limit", OPT_SELECT_LIMIT,
-   N_("Automatic limit for SELECT when using --safe-updates"),
-   (char**) &select_limit,
-   (char**) &select_limit, 0, GET_UINT32, REQUIRED_ARG, 1000L, 1, ULONG_MAX,
-   0, 1, 0},
-  {"max_join_size", OPT_MAX_JOIN_SIZE,
-   N_("Automatic limit for rows in a join when using --safe-updates"),
-   (char**) &max_join_size,
-   (char**) &max_join_size, 0, GET_UINT32, REQUIRED_ARG, 1000000L, 1, ULONG_MAX,
-   0, 1, 0},
-  {"secure-auth", OPT_SECURE_AUTH, N_("Refuse client connecting to server if it uses old (pre-4.1.1) protocol"), (char**) &opt_secure_auth,
-   (char**) &opt_secure_auth, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
-  {"show-warnings", OPT_SHOW_WARNINGS, N_("Show warnings after every statement."),
-   (char**) &show_warnings, (char**) &show_warnings, 0, GET_BOOL, NO_ARG,
-   0, 0, 0, 0, 0, 0},
-  {"show-progress-size", OPT_SHOW_PROGRESS_SIZE, N_("Number of lines before each import progress report."),
-   (char**) &show_progress_size, (char**) &show_progress_size, 0, GET_UINT32, REQUIRED_ARG,
-   0, 0, 0, 0, 0, 0},
-  {"ping", OPT_PING, N_("Ping the server to check if it's alive."),
-   (char**) &opt_ping, (char**) &opt_ping, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
-  {"mysql", 'm', N_("Use MySQL Protocol."),
-   (char**) &opt_mysql, (char**) &opt_mysql, 0, GET_BOOL, NO_ARG, 1, 0, 0,
-   0, 0, 0},
-  { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
-};
-
-
-static void usage(int version)
-{
-  const char* readline= "readline";
-
-  printf(_("%s  Ver %s Distrib %s, for %s-%s (%s) using %s %s\n"),
-         internal::my_progname, VER.c_str(), drizzle_version(),
-         HOST_VENDOR, HOST_OS, HOST_CPU,
-         readline, rl_library_version);
-
-  if (version)
-    return;
-  printf(_("Copyright (C) 2008 Sun Microsystems\n"
-           "This software comes with ABSOLUTELY NO WARRANTY. "
-           "This is free software,\n"
-           "and you are welcome to modify and redistribute it "
-           "under the GPL license\n"));
-  printf(_("Usage: %s [OPTIONS] [database]\n"), internal::my_progname);
-  my_print_help(my_long_options);
-  internal::print_defaults("drizzle", load_default_groups);
-  my_print_variables(my_long_options);
-}
-
-
-static int get_one_option(int optid, const struct option *, char *argument)
-{
-  char *endchar= NULL;
-  uint64_t temp_drizzle_port= 0;
-
-  switch(optid) {
-  case  OPT_DEFAULT_CHARSET:
-    default_charset_used= 1;
-    break;
-  case OPT_DELIMITER:
-    if (argument == disabled_my_option)
-    {
-      strcpy(delimiter, DEFAULT_DELIMITER);
-    }
-    else
-    {
-      /* Check that delimiter does not contain a backslash */
-      if (!strstr(argument, "\\"))
-      {
-        strncpy(delimiter, argument, sizeof(delimiter) - 1);
-      }
-      else
-      {
-        put_info(_("DELIMITER cannot contain a backslash character"),
-                 INFO_ERROR,0,0);
-        return false;
-      }
-    }
-    delimiter_length= (uint32_t)strlen(delimiter);
-    delimiter_str= delimiter;
-    break;
-  case OPT_TEE:
-    if (argument == disabled_my_option)
-    {
-      if (opt_outfile)
-        end_tee();
-    }
-    else
-      init_tee(argument);
-    break;
-  case OPT_NOTEE:
-    printf(_("WARNING: option deprecated; use --disable-tee instead.\n"));
-    if (opt_outfile)
-      end_tee();
-    break;
-  case OPT_PAGER:
-    if (argument == disabled_my_option)
-      opt_nopager= 1;
-    else
-    {
-      opt_nopager= 0;
-      if (argument && strlen(argument))
-      {
-        default_pager_set= 1;
-        strncpy(pager, argument, sizeof(pager) - 1);
-        strcpy(default_pager, pager);
-      }
-      else if (default_pager_set)
-        strcpy(pager, default_pager);
-      else
-        opt_nopager= 1;
-    }
-    break;
-  case OPT_NOPAGER:
-    printf(_("WARNING: option deprecated; use --disable-pager instead.\n"));
-    opt_nopager= 1;
-    break;
-  case OPT_SERVER_ARG:
-    printf(_("WARNING: --server-arg option not supported in this configuration.\n"));
-    break;
-  case 'A':
-    opt_rehash= 0;
-    break;
-  case 'N':
-    column_names= 0;
-    break;
-  case 'e':
-    status.setBatch(1);
-    status.setAddToHistory(1);
-    if (status.getLineBuff() == NULL)
-      status.setLineBuff(opt_max_input_line,NULL);
-    if (status.getLineBuff() == NULL)
-    {
-      internal::my_end();
-      exit(1);
-    }
-    status.getLineBuff()->addString(argument);
-    break;
-  case 'o':
-    if (argument == disabled_my_option)
-      one_database= 0;
-    else
-      one_database= skip_updates= 1;
-    break;
-  case 'p':
-    temp_drizzle_port= (uint64_t) strtoul(argument, &endchar, 10);
-    /* if there is an alpha character this is not a valid port */
-    if (strlen(endchar) != 0)
-    {
-      put_info(_("Non-integer value supplied for port.  If you are trying to enter a password please use --password instead."), INFO_ERROR, 0, 0);
-      return false;
-    }
-    /* If the port number is > 65535 it is not a valid port
-       This also helps with potential data loss casting unsigned long to a
-       uint32_t. */
-    if ((temp_drizzle_port == 0) || (temp_drizzle_port > 65535))
-    {
-      put_info(_("Value supplied for port is not valid."), INFO_ERROR, 0, 0);
-      return false;
-    }
-    else
-    {
-      opt_drizzle_port= (uint32_t) temp_drizzle_port;
-    }
-    break;
-  case 'P':
-    /* Don't require password */
-    if (argument == disabled_my_option)
-    {
-      argument= (char*) "";
-    }
-    if (argument)
-    {
-      char *start= argument;
-      free(opt_password);
-      opt_password= strdup(argument);
-      while (*argument)
-      {
-        /* Overwriting password with 'x' */
-        *argument++= 'x';
-      }
-      if (*start)
-      {
-        start[1]= 0;
-      }
-      tty_password= 0;
-    }
-    else
-    {
-      tty_password= 1;
-    }
-    break;
-  case 's':
-    if (argument == disabled_my_option)
-      opt_silent= 0;
-    else
-      opt_silent++;
-    break;
-  case 'v':
-    if (argument == disabled_my_option)
-      verbose= 0;
-    else
-      verbose++;
-    break;
-  case 'B':
-    status.setBatch(1);
-    status.setAddToHistory(0);
-    set_if_bigger(opt_silent,1);                         // more silent
-    break;
-  case 'V':
-    usage(1);
-    exit(0);
-  case 'I':
-  case '?':
-    usage(0);
-    exit(0);
-  }
-  return 0;
-}
-
-
-static int get_options(int argc, char **argv)
+
+
+static int process_options(void)
 {
   char *tmp, *pagpoint;
-  int ho_error;
+  
 
   tmp= (char *) getenv("DRIZZLE_HOST");
   if (tmp)
@@ -1953,8 +1978,7 @@
     strcpy(pager, pagpoint);
   strcpy(default_pager, pager);
 
-  if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option)))
-    exit(ho_error);
+  //
 
   if (status.getBatch()) /* disable pager and outfile in this case */
   {
@@ -1967,20 +1991,8 @@
     connect_flag= DRIZZLE_CAPABILITIES_NONE; /* Not in interactive mode */
   }
 
-  if (argc > 1)
-  {
-    usage(0);
-    exit(1);
-  }
-  if (argc == 1)
-  {
-    skip_updates= 0;
-    free(current_db);
-    current_db= strdup(*argv);
-  }
   if (tty_password)
     opt_password= client_get_tty_password(NULL);
-
   return(0);
 }
 
@@ -2582,7 +2594,7 @@
   drizzle_column_st *sql_field;
   string tmp_str, tmp_str_lower;
 
-  if (status.getBatch() || quick || !current_db)
+  if (status.getBatch() || quick || current_db.empty())
     return;      // We don't need completion in batches
   if (!rehash)
     return;
@@ -2717,8 +2729,8 @@
   drizzle_return_t ret;
   drizzle_result_st res;
 
-  free(current_db);
-  current_db= NULL;
+  current_db.erase();
+  current_db= "";
   /* In case of error below current_db will be NULL */
   if (drizzle_query_str(&con, &res, "SELECT DATABASE()", &ret) != NULL)
   {
@@ -3746,12 +3758,12 @@
     tmp= get_arg(buff, 0);
     if (tmp && *tmp)
     {
-      free(current_db);
+      current_db.erase();
       current_db= strdup(tmp);
       tmp= get_arg(buff, 1);
       if (tmp)
       {
-        free(current_host);
+        current_host.erase();
         current_host=strdup(tmp);
       }
     }
@@ -3766,7 +3778,7 @@
   }
   else
     opt_rehash= 0;
-  error=sql_connect(current_host,current_db,current_user,opt_password,0);
+  error=sql_connect(current_host, current_db, current_user, opt_password,0);
   opt_rehash= save_rehash;
 
   if (connected)
@@ -3774,7 +3786,7 @@
     sprintf(buff,"Connection id:    %u",drizzle_con_thread_id(&con));
     put_info(buff,INFO_INFO,0,0);
     sprintf(buff,"Current database: %.128s\n",
-            current_db ? current_db : "*** NONE ***");
+            !current_db.empty() ? current_db.c_str() : "*** NONE ***");
     put_info(buff,INFO_INFO,0,0);
   }
   return error;
@@ -3896,7 +3908,7 @@
   */
   get_current_db();
 
-  if (!current_db || strcmp(current_db,tmp))
+  if (current_db.empty() || strcmp(current_db.c_str(),tmp))
   {
     if (one_database)
     {
@@ -3948,7 +3960,7 @@
       else
         drizzle_result_free(&result);
     }
-    free(current_db);
+    current_db.erase();
     current_db= strdup(tmp);
     if (select_db > 1)
       build_completion_hash(opt_rehash, 1);
@@ -4037,11 +4049,10 @@
 
 
 static int
-sql_connect(char *host,char *database,char *user,char *password,
+sql_connect(const string &host, const string &database, const string &user, const string &password,
                  uint32_t silent)
 {
   drizzle_return_t ret;
-
   if (connected)
   {
     connected= 0;
@@ -4049,8 +4060,8 @@
     drizzle_free(&drizzle);
   }
   drizzle_create(&drizzle);
-  if (drizzle_con_add_tcp(&drizzle, &con, host, opt_drizzle_port, user,
-                          password, database, opt_mysql ? DRIZZLE_CON_MYSQL : DRIZZLE_CON_NONE) == NULL)
+  if (drizzle_con_add_tcp(&drizzle, &con, (char *)host.c_str(), opt_drizzle_port, (char *)user.c_str(),
+                          (char *)password.c_str(), (char *)database.c_str(), opt_mysql ? DRIZZLE_CON_MYSQL : DRIZZLE_CON_NONE) == NULL)
   {
     (void) put_error(&con, NULL);
     (void) fflush(stdout);
@@ -4106,7 +4117,12 @@
   drizzle_return_t ret;
 
   tee_puts("--------------", stdout);
-  usage(1);          /* Print version */
+  printf(_("%s  Ver %s Distrib %s, for %s-%s (%s) using readline %s\n"),
+  internal::my_progname, VER.c_str(), drizzle_version(),
+  HOST_VENDOR, HOST_OS, HOST_CPU,
+  rl_library_version);          /* Print version */
+
+
   if (connected)
   {
     tee_fprintf(stdout, "\nConnection id:\t\t%lu\n",drizzle_con_thread_id(&con));
@@ -4452,7 +4468,7 @@
   struct tm *t = localtime(&lclock);
 
   /* parse thru the settings for the prompt */
-  for (char *c= current_prompt; *c; (void)*c++)
+  for (char *c= (char *)current_prompt.c_str(); *c; (void)*c++)
   {
     if (*c != PROMPT_CHAR)
     {
@@ -4479,7 +4495,7 @@
           processed_prompt->append("not_connected");
         break;
       case 'd':
-        processed_prompt->append(current_db ? current_db : "(none)");
+        processed_prompt->append(!current_db.empty() ? current_db.c_str() : "(none)");
         break;
       case 'h':
       {
@@ -4516,13 +4532,13 @@
         if (!full_username)
           init_username();
         processed_prompt->append(full_username ? full_username :
-                                 (current_user ?  current_user : "(unknown)"));
+                                 (!current_user.empty() ?  current_user.c_str() : "(unknown)"));
         break;
       case 'u':
         if (!full_username)
           init_username();
         processed_prompt->append(part_username ? part_username :
-                                 (current_user ?  current_user : "(unknown)"));
+                                 (!current_user.empty() ?  current_user.c_str() : "(unknown)"));
         break;
       case PROMPT_CHAR:
         {
@@ -4601,7 +4617,7 @@
         processed_prompt->append("\t");
         break;
       case 'l':
-        processed_prompt->append(delimiter_str);
+        processed_prompt->append(delimiter_str.c_str());
         break;
       default:
         processed_prompt->append(c, 1);
@@ -4649,9 +4665,9 @@
     tee_fprintf(stdout, "Memory allocation error. Not changing prompt\n");
   else
   {
-    free(current_prompt);
+    current_prompt.erase();
     current_prompt= tmpptr;
-    tee_fprintf(stdout, "PROMPT set to '%s'\n", current_prompt);
+    tee_fprintf(stdout, "PROMPT set to '%s'\n", current_prompt.c_str());
   }
   return 0;
 }

=== modified file 'client/include.am'
--- client/include.am	2010-06-02 16:51:50 +0000
+++ client/include.am	2010-06-03 17:20:45 +0000
@@ -45,7 +45,7 @@
 
 
 client_drizzle_SOURCES=		client/drizzle.cc client/linebuffer.cc
-client_drizzle_LDADD=		${CLIENT_LDADD} ${READLINE_LIBS}
+client_drizzle_LDADD=		${CLIENT_LDADD} ${READLINE_LIBS} ${BOOST_LIBS}
 client_drizzle_CXXFLAGS=	${CLIENT_CXXFLAGS}
 
 client_drizzledump_SOURCES=	client/drizzledump.cc