← 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: 2010-12-22 16:40:49 UTC
  • mto: (2022.2.1 clean)
  • mto: This revision was merged to the branch mainline in revision 2025.
  • Revision ID: brian@tangent.org-20101222164049-vjbi97jztrlr01l1
Encapsulate client call. Also remove the need to call current_session when
looking for privs for processlist.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_error.cc
214
214
  field_list.push_back(new Item_return_int("Code",4, DRIZZLE_TYPE_LONG));
215
215
  field_list.push_back(new Item_empty_string("Message",DRIZZLE_ERRMSG_SIZE));
216
216
 
217
 
  if (session->client->sendFields(&field_list))
 
217
  if (session->getClient()->sendFields(&field_list))
218
218
    return true;
219
219
 
220
220
  DRIZZLE_ERROR *err;
234
234
      continue;
235
235
    if (idx > unit->select_limit_cnt)
236
236
      break;
237
 
    session->client->store(warning_level_names[err->level].str,
238
 
                           warning_level_names[err->level].length);
239
 
    session->client->store((uint32_t) err->code);
240
 
    session->client->store(err->msg, strlen(err->msg));
241
 
    if (session->client->flush())
 
237
    session->getClient()->store(warning_level_names[err->level].str,
 
238
                                warning_level_names[err->level].length);
 
239
    session->getClient()->store((uint32_t) err->code);
 
240
    session->getClient()->store(err->msg, strlen(err->msg));
 
241
    if (session->getClient()->flush())
242
242
      return(true);
243
243
  }
244
244
  session->my_eof();