← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzleimport.cc

  • Committer: Andrew Hutchings
  • Date: 2011-02-01 10:23:22 UTC
  • mto: (2136.1.1 build)
  • mto: This revision was merged to the branch mainline in revision 2137.
  • Revision ID: andrew@linuxjedi.co.uk-20110201102322-oxztcyrjzg3c7yta
Fix counters cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzleimport.cc
27
27
#include <boost/program_options.hpp>
28
28
#include <pthread.h>
29
29
 
30
 
#include <drizzled/definitions.h>
31
 
#include <drizzled/internal/my_sys.h>
32
30
/* Added this for string translation. */
33
31
#include <drizzled/gettext.h>
34
32
#include <drizzled/configmake.h>
41
39
 
42
40
int exitcode= 0;
43
41
 
44
 
const char *program_name= "drizzleimport";
 
42
const char *program_name= "drizzlesimport";
45
43
 
46
44
/* Global Thread counter */
47
45
uint32_t counter;
399
397
  "Load files in parallel. The argument is the number of threads to use for loading data (default is 4.")
400
398
  ;
401
399
 
402
 
  const char* unix_user= getlogin();
403
 
 
404
400
  po::options_description client_options("Options specific to the client");
405
401
  client_options.add_options()
406
402
  ("host,h", po::value<string>(&current_host)->default_value("localhost"),
411
407
  "Port number to use for connection") 
412
408
  ("protocol", po::value<string>(&opt_protocol)->default_value("mysql"),
413
409
  "The protocol of connection (mysql or drizzle).")
414
 
  ("user,u", po::value<string>(&current_user)->default_value((unix_user ? unix_user : "")),
 
410
  ("user,u", po::value<string>(&current_user)->default_value(""),
415
411
  "User for login if not current user.")
416
412
  ;
417
413