← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzle.cc

  • Committer: Patrick Crews
  • Date: 2010-08-17 17:42:29 UTC
  • mfrom: (1711.1.24 build)
  • Revision ID: gleebix@gmail.com-20100817174229-e28p5025ndgkkxif
Rollup patch - optimizer fixes, mutex removal, client cleanup, translations update

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzle.cc
1782
1782
  glob_buffer= new string();
1783
1783
  glob_buffer->reserve(512);
1784
1784
 
1785
 
  char * output_buff= (char *)malloc(512);
1786
 
  memset(output_buff, '\0', 512);
1787
 
 
1788
 
  sprintf(output_buff,
 
1785
  std::vector<char> output_buff;
 
1786
  output_buff.resize(512);
 
1787
  snprintf(&output_buff[0], output_buff.size(),
1789
1788
          _("Your Drizzle connection id is %u\nServer version: %s\n"),
1790
1789
          drizzle_con_thread_id(&con),
1791
1790
          server_version_string(&con));
1792
 
  put_info(output_buff, INFO_INFO, 0, 0);
 
1791
  put_info(&output_buff[0], INFO_INFO, 0, 0);
1793
1792
 
1794
1793
  initialize_readline((char *)current_prompt.c_str());
1795
1794
  if (!status.getBatch() && !quick)
3136
3135
  drizzle_row_t cur;
3137
3136
  drizzle_return_t ret;
3138
3137
  drizzle_column_st *field;
3139
 
  bool *num_flag;
 
3138
  std::vector<bool> num_flag;
3140
3139
  string separator;
3141
3140
 
3142
3141
  separator.reserve(256);
3143
3142
 
3144
 
  num_flag=(bool*) malloc(sizeof(bool)*drizzle_result_column_count(result));
 
3143
  num_flag.resize(drizzle_result_column_count(result));
3145
3144
  if (column_types_flag)
3146
3145
  {
3147
3146
    print_field_types(result);
3282
3281
      drizzle_row_free(result, cur);
3283
3282
  }
3284
3283
  tee_puts(separator.c_str(), PAGER);
3285
 
  free(num_flag);
3286
3284
}
3287
3285
 
3288
3286
/**