← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_error.cc

  • Committer: Brian Aker
  • Date: 2009-04-09 01:50:49 UTC
  • mfrom: (971.3.21 eday-dev)
  • Revision ID: brian@gaz-20090409015049-ohyn58r972hkccj2
Merge Eric

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_error.cc
203
203
  field_list.push_back(new Item_return_int("Code",4, DRIZZLE_TYPE_LONG));
204
204
  field_list.push_back(new Item_empty_string("Message",DRIZZLE_ERRMSG_SIZE));
205
205
 
206
 
  if (session->protocol->send_fields(&field_list,
207
 
                                 Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
 
206
  if (session->protocol->sendFields(&field_list,
 
207
                                  Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
208
208
    return(true);
209
209
 
210
210
  DRIZZLE_ERROR *err;
225
225
      continue;
226
226
    if (idx > unit->select_limit_cnt)
227
227
      break;
228
 
    protocol->prepare_for_resend();
 
228
    protocol->prepareForResend();
229
229
    protocol->store(warning_level_names[err->level].str,
230
230
                    warning_level_names[err->level].length, system_charset_info);
231
231
    protocol->store((uint32_t) err->code);