← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/mysqlcheck.c

  • Committer: Brian Aker
  • Date: 2008-07-15 01:48:24 UTC
  • mfrom: (77.1.101 codestyle)
  • Revision ID: brian@tangent.org-20080715014824-3ahhe2znii7ummb7
Monty's merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/mysqlcheck.c
43
43
            *current_host = 0;
44
44
static int first_error = 0;
45
45
DYNAMIC_ARRAY tables4repair;
46
 
#ifdef HAVE_SMEM
47
 
static char *shared_memory_base_name=0;
48
 
#endif
49
46
static uint opt_protocol=0;
50
47
static CHARSET_INFO *charset_info= &my_charset_latin1;
51
48
 
144
141
  {"repair", 'r',
145
142
   "Can fix almost anything except unique keys that aren't unique.",
146
143
   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
147
 
#ifdef HAVE_SMEM
148
 
  {"shared-memory-base-name", OPT_SHARED_MEMORY_BASE_NAME,
149
 
   "Base name of shared memory.", (char**) &shared_memory_base_name, (char**) &shared_memory_base_name,
150
 
   0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
151
 
#endif
152
144
  {"silent", 's', "Print only error messages.", (char**) &opt_silent,
153
145
   (char**) &opt_silent, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
154
146
  {"socket", 'S', "Socket file to use for connection.",
731
723
    mysql_options(&mysql_connection, MYSQL_OPT_COMPRESS, NullS);
732
724
  if (opt_protocol)
733
725
    mysql_options(&mysql_connection,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol);
734
 
#ifdef HAVE_SMEM
735
 
  if (shared_memory_base_name)
736
 
    mysql_options(&mysql_connection,MYSQL_SHARED_MEMORY_BASE_NAME,shared_memory_base_name);
737
 
#endif
738
726
  if (!(sock = mysql_real_connect(&mysql_connection, host, user, passwd,
739
727
         NULL, opt_mysql_port, opt_mysql_unix_port, 0)))
740
728
  {
822
810
  if (opt_auto_repair)
823
811
    delete_dynamic(&tables4repair);
824
812
  my_free(opt_password, MYF(MY_ALLOW_ZERO_PTR));
825
 
#ifdef HAVE_SMEM
826
 
  my_free(shared_memory_base_name,MYF(MY_ALLOW_ZERO_PTR));
827
 
#endif
828
813
  my_end(my_end_arg);
829
814
  return(first_error!=0);
830
815
} /* main */