← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzle.cc

  • Committer: lbieber
  • Date: 2010-10-06 19:12:01 UTC
  • mfrom: (1817.1.3 build)
  • Revision ID: lbieber@orisndriz08-20101006191201-fp7wgds0ykr14d21
Merge Monty - First pass at our own custom config file parser to work around bugs in the ubuntu lucid version of boost
Merge Patrick G. - Fix to compile on OS X
Merge Joe - make transaction_message_threshold configurable on the command line

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzle.cc
158
158
#define vidattr(A) {}      // Can't get this to work
159
159
#endif
160
160
#include <boost/program_options.hpp>
 
161
#include "drizzled/program_options/config_file.h"
161
162
 
162
163
using namespace std;
163
164
namespace po=boost::program_options;
 
165
namespace dpo=drizzled::program_options;
164
166
 
165
167
/* Don't try to make a nice table if the data is too big */
166
168
const uint32_t MAX_COLUMN_LENGTH= 1024;
1418
1420
    user_config_dir_client.append("/drizzle/client.cnf");
1419
1421
 
1420
1422
    ifstream user_drizzle_ifs(user_config_dir_drizzle.c_str());
1421
 
    po::store(parse_config_file(user_drizzle_ifs, drizzle_options), vm);
 
1423
    po::store(dpo::parse_config_file(user_drizzle_ifs, drizzle_options), vm);
1422
1424
 
1423
1425
    ifstream user_client_ifs(user_config_dir_client.c_str());
1424
 
    po::store(parse_config_file(user_client_ifs, client_options), vm);
 
1426
    po::store(dpo::parse_config_file(user_client_ifs, client_options), vm);
1425
1427
 
1426
1428
    ifstream system_drizzle_ifs(system_config_dir_drizzle.c_str());
1427
 
    store(parse_config_file(system_drizzle_ifs, drizzle_options), vm);
 
1429
    store(dpo::parse_config_file(system_drizzle_ifs, drizzle_options), vm);
1428
1430
 
1429
1431
    ifstream system_client_ifs(system_config_dir_client.c_str());
1430
 
    po::store(parse_config_file(system_client_ifs, client_options), vm);
 
1432
    po::store(dpo::parse_config_file(system_client_ifs, client_options), vm);
1431
1433
  }
1432
1434
 
1433
1435
  po::notify(vm);