← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzle.cc

  • Committer: Lee Bieber
  • Date: 2011-03-23 23:16:25 UTC
  • mfrom: (2247.1.2 build)
  • Revision ID: kalebral@gmail.com-20110323231625-61k77qbh7n1iu776
Merge Olaf - Use BOOST_FOREACH
Merge Olaf - Remove std::nothrow from new()

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzle.cc
244
244
 
245
245
  void setLineBuff(int max_size, FILE *file=NULL)
246
246
  {
247
 
    line_buff= new(std::nothrow) LineBuffer(max_size, file);
 
247
    line_buff= new LineBuffer(max_size, file);
248
248
  }
249
249
 
250
250
  void setLineBuff(LineBuffer *in_line_buff)
3949
3949
    return put_info(buff, INFO_ERROR, 0 ,0);
3950
3950
  }
3951
3951
 
3952
 
  line_buff= new(std::nothrow) LineBuffer(opt_max_input_line,sql_file);
3953
 
  if (line_buff == NULL)
3954
 
  {
3955
 
    fclose(sql_file);
3956
 
    return put_info(_("Can't initialize LineBuffer"), INFO_ERROR, 0, 0);
3957
 
  }
 
3952
  line_buff= new LineBuffer(opt_max_input_line,sql_file);
3958
3953
 
3959
3954
  /* Save old status */
3960
3955
  old_status=status;