← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Andrew Hutchings
  • Date: 2010-09-08 19:03:09 UTC
  • mfrom: (1750 staging)
  • mto: (1750.1.1 build)
  • mto: This revision was merged to the branch mainline in revision 1751.
  • Revision ID: andrew@linuxjedi.co.uk-20100908190309-mya1nu7xvo1fpvk8
Merge trunk into branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
212
212
  mysys_var= 0;
213
213
  scoreboard_index= -1;
214
214
  dbug_sentry=Session_SENTRY_MAGIC;
215
 
  cleanup_done= abort_on_warning= no_warnings_for_error= false;
 
215
  cleanup_done= abort_on_warning= no_warnings_for_error= false;  
 
216
 
 
217
  /* query_cache init */
 
218
  query_cache_key= "";
 
219
  resultset= NULL;
216
220
 
217
221
  /* Variables with default values */
218
222
  proc_info="login";
648
652
  if (client->readCommand(&l_packet, &packet_length) == false)
649
653
    return false;
650
654
 
 
655
  if (killed == KILL_CONNECTION)
 
656
    return false;
 
657
 
651
658
  if (packet_length == 0)
652
659
    return true;
653
660
 
1476
1483
{
1477
1484
  /* Cleanup SQL processing state to reuse this statement in next query. */
1478
1485
  lex_end(lex);
 
1486
  query_cache_key= ""; // reset the cache key
 
1487
  resetResultsetMessage();
1479
1488
}
1480
1489
 
1481
1490
bool Session::copy_db_to(char **p_db, size_t *p_db_length)