← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzleclient/client.cc

  • Committer: Brian Aker
  • Date: 2009-04-01 01:25:04 UTC
  • mfrom: (968.2.27 mordred)
  • Revision ID: brian@tangent.org-20090401012504-mq9sxcmph5jc1fh6
Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzleclient/client.cc
80
80
 
81
81
#include <drizzled/gettext.h>
82
82
 
 
83
using namespace std;
83
84
 
84
85
#if defined(HAVE_GETPWUID) && defined(NO_GETPWUID_DECL)
85
86
struct passwd *getpwuid(uid_t);
506
507
  case DRIZZLE_READ_DEFAULT_FILE:
507
508
    if (drizzle->options.my_cnf_file != NULL)
508
509
      free(drizzle->options.my_cnf_file);
509
 
    drizzle->options.my_cnf_file=strdup(arg);
 
510
    drizzle->options.my_cnf_file=strdup((char *)arg);
510
511
    break;
511
512
  case DRIZZLE_READ_DEFAULT_GROUP:
512
513
    if (drizzle->options.my_cnf_group != NULL)
513
514
      free(drizzle->options.my_cnf_group);
514
 
    drizzle->options.my_cnf_group=strdup(arg);
 
515
    drizzle->options.my_cnf_group=strdup((char *)arg);
515
516
    break;
516
517
  case DRIZZLE_OPT_PROTOCOL:
517
518
    break;
520
521
    drizzle->options.methods_to_use= option;
521
522
    break;
522
523
  case DRIZZLE_SET_CLIENT_IP:
523
 
    drizzle->options.client_ip= strdup(arg);
 
524
    drizzle->options.client_ip= strdup((char *)arg);
524
525
    break;
525
526
  case DRIZZLE_SECURE_AUTH:
526
527
    drizzle->options.secure_auth= *(const bool *) arg;