← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzleimport.cc

  • Committer: Stewart Smith
  • Date: 2010-11-07 04:22:31 UTC
  • mto: (1911.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 1912.
  • Revision ID: stewart@flamingspork.com-20101107042231-ola4sl7j0qvg58tz
https://launchpad.net/bugs/668880
fix ARCHIVE storage engine calling exit (lintian warning). Was because we were linking in libinternal into libazio, which links into archive plugin. Just link libinternal into the command line utilities.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzleimport.cc
2
2
  Copyright (C) 2010 Vijay Samuel
3
3
  Copyright (C) 2010 Brian Aker
4
4
  Copyright (C) 2000-2006 MySQL AB
5
 
  Copyright (C) 2008-2009 Sun Microsystems, Inc.
 
5
  Copyright (C) 2008-2009 Sun Microsystems, Inc
6
6
 
7
7
  This program is free software; you can redistribute it and/or modify
8
8
  it under the terms of the GNU General Public License as published by
39
39
 
40
40
int exitcode= 0;
41
41
 
42
 
const char *program_name= "drizzleimport";
 
42
const char *program_name= "drizzlesimport";
43
43
 
44
44
/* Global Thread counter */
45
45
uint32_t counter;
422
422
  
423
423
  std::string user_config_dir((getenv("XDG_CONFIG_HOME")? getenv("XDG_CONFIG_HOME"):"~/.config"));
424
424
 
425
 
  if (user_config_dir.compare(0, 2, "~/") == 0)
426
 
  {
427
 
    char *homedir;
428
 
    homedir= getenv("HOME");
429
 
    if (homedir != NULL)
430
 
      user_config_dir.replace(0, 1, homedir);
431
 
  }
432
 
 
433
425
  po::variables_map vm;
434
426
 
435
427
  // Disable allow_guessing