← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/mysqldump.c

  • Committer: Monty Taylor
  • Date: 2008-07-15 00:14:18 UTC
  • mto: (77.6.2 glibclient-merge)
  • mto: This revision was merged to the branch mainline in revision 162.
  • Revision ID: monty@inaugust.com-20080715001418-k7olq8eznx0hg0fy
Removed ifdefs from client progs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/mysqldump.c
126
126
FILE *md_result_file= 0;
127
127
FILE *stderror_file=0;
128
128
 
129
 
#ifdef HAVE_SMEM
130
 
static char *shared_memory_base_name=0;
131
 
#endif
132
129
static uint opt_protocol= MYSQL_PROTOCOL_TCP;
133
130
 
134
131
/*
413
410
  {"set-variable", 'O',
414
411
   "Change the value of a variable. Please note that this option is deprecated; you can set variables directly with --variable-name=value.",
415
412
   0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
416
 
#ifdef HAVE_SMEM
417
 
  {"shared-memory-base-name", OPT_SHARED_MEMORY_BASE_NAME,
418
 
   "Base name of shared memory.", (char**) &shared_memory_base_name, (char**) &shared_memory_base_name,
419
 
   0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
420
 
#endif
421
413
  /*
422
414
    Note that the combination --single-transaction --master-data
423
415
    will give bullet-proof binlog position only if server >=4.1.3. That's the
1109
1101
    mysql_options(&mysql_connection,MYSQL_OPT_COMPRESS,NullS);
1110
1102
  if (opt_protocol)
1111
1103
    mysql_options(&mysql_connection,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol);
1112
 
#ifdef HAVE_SMEM
1113
 
  if (shared_memory_base_name)
1114
 
    mysql_options(&mysql_connection,MYSQL_SHARED_MEMORY_BASE_NAME,shared_memory_base_name);
1115
 
#endif
1116
1104
  mysql_options(&mysql_connection, MYSQL_SET_CHARSET_NAME, default_charset);
1117
1105
  if (!(mysql= mysql_real_connect(&mysql_connection,host,user,passwd,
1118
1106
                                  NULL,opt_mysql_port, NULL,
3530
3518
  if (opt_delete_master_logs && purge_bin_logs_to(mysql, bin_log_name))
3531
3519
    goto err;
3532
3520
 
3533
 
#ifdef HAVE_SMEM
3534
 
  my_free(shared_memory_base_name,MYF(MY_ALLOW_ZERO_PTR));
3535
 
#endif
3536
3521
  /*
3537
3522
    No reason to explicitely COMMIT the transaction, neither to explicitely
3538
3523
    UNLOCK TABLES: these will be automatically be done by the server when we