← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzleimport.cc

  • Committer: Lee
  • Date: 2008-10-03 23:31:06 UTC
  • mfrom: (413.2.3 drizzle)
  • mto: This revision was merged to the branch mainline in revision 459.
  • Revision ID: lbieber@lbieber-desktop-20081003233106-tgvzu0fh25gb3xeg
breaking out enum field classes

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzleimport.cc
191
191
    if (argument)
192
192
    {
193
193
      char *start=argument;
194
 
      free(opt_password);
 
194
      my_free(opt_password,MYF(MY_ALLOW_ZERO_PTR));
195
195
      opt_password=my_strdup(argument,MYF(MY_FAE));
196
196
      while (*argument) *argument++= 'x';    /* Destroy argument */
197
197
      if (*start)
246
246
  current_db= *((*argv)++);
247
247
  (*argc)--;
248
248
  if (tty_password)
249
 
    opt_password=get_tty_password(NULL);
 
249
    opt_password=get_tty_password(NullS);
250
250
  return(0);
251
251
}
252
252
 
362
362
  if (!(drizzle= drizzle_create(NULL)))
363
363
    return 0;
364
364
  if (opt_compress)
365
 
    drizzle_options(drizzle,DRIZZLE_OPT_COMPRESS,NULL);
 
365
    drizzle_options(drizzle,DRIZZLE_OPT_COMPRESS,NullS);
366
366
  if (opt_local_file)
367
367
    drizzle_options(drizzle,DRIZZLE_OPT_LOCAL_INFILE,
368
368
      (char*) &opt_local_file);
431
431
  {
432
432
    /* Don't escape hex constants */
433
433
    if (object[0] == '0' && (object[1] == 'x' || object[1] == 'X'))
434
 
      ptr= strxmov(ptr," ",statement," ",object,NULL);
 
434
      ptr= strxmov(ptr," ",statement," ",object,NullS);
435
435
    else
436
436
    {
437
437
      /* char constant; escape */
438
 
      ptr= strxmov(ptr," ",statement," '",NULL);
 
438
      ptr= strxmov(ptr," ",statement," '",NullS);
439
439
      ptr= field_escape(ptr,object,(uint) strlen(object));
440
440
      *ptr++= '\'';
441
441
    }
605
605
          exitcode= error;
606
606
    db_disconnect(current_host, drizzle);
607
607
  }
608
 
  free(opt_password);
 
608
  my_free(opt_password,MYF(MY_ALLOW_ZERO_PTR));
609
609
  free_defaults(argv_to_free);
610
610
  my_end(my_end_arg);
611
611
  return(exitcode);