← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

  • Committer: Brian Aker
  • Date: 2009-09-22 07:35:28 UTC
  • mfrom: (971.6.10 eday-dev)
  • Revision ID: brian@gaz-20090922073528-xgm634aomuflqxl3
Merge Eric

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
34
34
#include <drizzled/sql_load.h>
35
35
#include <drizzled/lock.h>
36
36
#include <drizzled/select_send.h>
 
37
#include <drizzled/plugin/client.h>
37
38
#include <drizzled/statement.h>
38
39
 
39
40
#include <bitset>
212
213
  }
213
214
  case COM_QUIT:
214
215
    /* We don't calculate statistics for this command */
215
 
    session->protocol->setError(0);
216
216
    session->main_da.disable_status();              // Don't send anything back
217
217
    error=true;                                 // End server
218
218
    break;
264
264
  {
265
265
  case Diagnostics_area::DA_ERROR:
266
266
    /* The query failed, send error to log and abort bootstrap. */
267
 
    session->protocol->sendError(session->main_da.sql_errno(),
268
 
                                 session->main_da.message());
 
267
    session->client->sendError(session->main_da.sql_errno(),
 
268
                               session->main_da.message());
269
269
    break;
270
270
 
271
271
  case Diagnostics_area::DA_EOF:
272
 
    session->protocol->sendEOF();
 
272
    session->client->sendEOF();
273
273
    break;
274
274
 
275
275
  case Diagnostics_area::DA_OK:
276
 
    session->protocol->sendOK();
 
276
    session->client->sendOK();
277
277
    break;
278
278
 
279
279
  case Diagnostics_area::DA_DISABLED:
281
281
 
282
282
  case Diagnostics_area::DA_EMPTY:
283
283
  default:
284
 
    session->protocol->sendOK();
 
284
    session->client->sendOK();
285
285
    break;
286
286
  }
287
287