← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/mysql.cc

  • 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/mysql.cc
176
176
static uint delimiter_length= 1;
177
177
unsigned short terminal_width= 80;
178
178
 
179
 
#ifdef HAVE_SMEM
180
 
static char *shared_memory_base_name=0;
181
 
#endif
182
179
static uint opt_protocol= MYSQL_PROTOCOL_TCP;
183
180
static CHARSET_INFO *charset_info= &my_charset_latin1;
184
181
 
1000
997
static const char *embedded_server_groups[]=
1001
998
{ "server", "embedded", "mysql_SERVER", 0 };
1002
999
 
1003
 
#ifdef HAVE_READLINE
1004
1000
/*
1005
1001
 HIST_ENTRY is defined for libedit, but not for the real readline
1006
1002
 Need to redefine it for real readline to find it
1020
1016
static int not_in_history(const char *line);
1021
1017
static void initialize_readline (char *name);
1022
1018
static void fix_history(String *final_command);
1023
 
#endif
1024
1019
 
1025
1020
static COMMANDS *find_command(char *name,char cmd_name);
1026
1021
static bool add_line(String &buffer,char *line,char *in_string,
1231
1226
  my_free(full_username,MYF(MY_ALLOW_ZERO_PTR));
1232
1227
  my_free(part_username,MYF(MY_ALLOW_ZERO_PTR));
1233
1228
  my_free(default_prompt,MYF(MY_ALLOW_ZERO_PTR));
1234
 
#ifdef HAVE_SMEM
1235
 
  my_free(shared_memory_base_name,MYF(MY_ALLOW_ZERO_PTR));
1236
 
#endif
1237
1229
  my_free(current_prompt,MYF(MY_ALLOW_ZERO_PTR));
1238
1230
  while (embedded_server_arg_count > 1)
1239
1231
    my_free(embedded_server_args[--embedded_server_arg_count],MYF(0));
1415
1407
   (char**) &opt_reconnect, (char**) &opt_reconnect, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
1416
1408
  {"silent", 's', "Be more silent. Print results with a tab as separator, each row on new line.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0,
1417
1409
   0, 0},
1418
 
#ifdef HAVE_SMEM
1419
 
  {"shared-memory-base-name", OPT_SHARED_MEMORY_BASE_NAME,
1420
 
   "Base name of shared memory.", (char**) &shared_memory_base_name, (char**) &shared_memory_base_name, 
1421
 
   0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
1422
 
#endif
1423
1410
  {"socket", 'S', "Socket file to use for connection.",
1424
1411
   (char**) &opt_mysql_unix_port, (char**) &opt_mysql_unix_port, 0, GET_STR_ALLOC,
1425
1412
   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
4050
4037
    mysql_options(&mysql,MYSQL_OPT_LOCAL_INFILE, (char*) &opt_local_infile);
4051
4038
  if (opt_protocol)
4052
4039
    mysql_options(&mysql,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol);
4053
 
#ifdef HAVE_SMEM
4054
 
  if (shared_memory_base_name)
4055
 
    mysql_options(&mysql,MYSQL_SHARED_MEMORY_BASE_NAME,shared_memory_base_name);
4056
 
#endif
4057
4040
  if (safe_updates)
4058
4041
  {
4059
4042
    char init_command[100];