← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzle.cc

  • Committer: Mark Atwood
  • Date: 2011-06-16 06:04:05 UTC
  • mfrom: (2318.4.8 refactor7)
  • Revision ID: me@mark.atwood.name-20110616060405-jqxvti75k6bpq741
merge lp:~olafvdspek/drizzle/refactor9

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzle.cc
1473
1473
  ("max-join-size", po::value<uint32_t>(&max_join_size)->default_value(1000000L),
1474
1474
  _("Automatic limit for rows in a join when using --safe-updates"))
1475
1475
  ;
1476
 
  UserDetect detected_user;
1477
 
  const char* shell_user= detected_user.getUser();
 
1476
 
1478
1477
  po::options_description client_options(_("Options specific to the client"));
1479
1478
  client_options.add_options()
1480
1479
  ("host,h", po::value<string>(&current_host)->default_value("localhost"),
1483
1482
  _("Password to use when connecting to server. If password is not given it's asked from the tty."))
1484
1483
  ("port,p", po::value<uint32_t>()->default_value(0),
1485
1484
  _("Port number to use for connection or 0 for default to, in order of preference, drizzle.cnf, $DRIZZLE_TCP_PORT, built-in default"))
1486
 
  ("user,u", po::value<string>(&current_user)->default_value(shell_user ? shell_user : ""),
 
1485
  ("user,u", po::value<string>(&current_user)->default_value(UserDetect().getUser()),
1487
1486
  _("User for login if not current user."))
1488
1487
  ("protocol",po::value<string>(&opt_protocol)->default_value("mysql"),
1489
1488
  _("The protocol of connection (mysql, mysql-plugin-auth, or drizzle)."))
1882
1881
      if (verbose)
1883
1882
        tee_fprintf(stdout, _("Reading history-file %s\n"),histfile);
1884
1883
      read_history(histfile);
1885
 
      if (!(histfile_tmp= (char*) malloc((uint32_t) strlen(histfile) + 5)))
1886
 
      {
1887
 
        fprintf(stderr, _("Couldn't allocate memory for temp histfile!\n"));
1888
 
        exit(1);
1889
 
      }
 
1884
      histfile_tmp= (char*) malloc((uint32_t) strlen(histfile) + 5);
1890
1885
      sprintf(histfile_tmp, "%s.TMP", histfile);
1891
1886
    }
1892
1887
  }