← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_error.cc

  • Committer: Diego Medina
  • Date: 2009-10-05 04:05:29 UTC
  • mfrom: (1161 staging)
  • mto: This revision was merged to the branch mainline in revision 1178.
  • Revision ID: diego.medina@sun.com-20091005040529-5g1qe9gxzslpgefd
resolved small merge issue

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_error.cc
46
46
#include <drizzled/sql_base.h>
47
47
#include <drizzled/item/empty_string.h>
48
48
#include <drizzled/item/return_int.h>
 
49
#include <drizzled/plugin/client.h>
49
50
 
50
51
using namespace drizzled;
51
52
 
206
207
  field_list.push_back(new Item_return_int("Code",4, DRIZZLE_TYPE_LONG));
207
208
  field_list.push_back(new Item_empty_string("Message",DRIZZLE_ERRMSG_SIZE));
208
209
 
209
 
  if (session->protocol->sendFields(&field_list))
 
210
  if (session->client->sendFields(&field_list))
210
211
    return true;
211
212
 
212
213
  DRIZZLE_ERROR *err;
213
214
  Select_Lex *sel= &session->lex->select_lex;
214
215
  Select_Lex_Unit *unit= &session->lex->unit;
215
216
  ha_rows idx= 0;
216
 
  plugin::Protocol *protocol= session->protocol;
217
217
 
218
218
  unit->set_limit(sel);
219
219
 
227
227
      continue;
228
228
    if (idx > unit->select_limit_cnt)
229
229
      break;
230
 
    protocol->prepareForResend();
231
 
    protocol->store(warning_level_names[err->level].str,
232
 
                    warning_level_names[err->level].length);
233
 
    protocol->store((uint32_t) err->code);
234
 
    protocol->store(err->msg, strlen(err->msg));
235
 
    if (protocol->write())
 
230
    session->client->store(warning_level_names[err->level].str,
 
231
                           warning_level_names[err->level].length);
 
232
    session->client->store((uint32_t) err->code);
 
233
    session->client->store(err->msg, strlen(err->msg));
 
234
    if (session->client->flush())
236
235
      return(true);
237
236
  }
238
237
  session->my_eof();