← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

  • Committer: mordred
  • Date: 2010-04-20 00:04:22 UTC
  • mfrom: (1491 bad-staging)
  • mto: This revision was merged to the branch mainline in revision 1498.
  • Revision ID: mordred@orisndriz09-20100420000422-if6mil1596804mrj
Merged up with build.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
315
315
  session->query.clear();
316
316
 
317
317
  session->set_proc_info(NULL);
318
 
  free_root(session->mem_root,MYF(memory::KEEP_PREALLOC));
 
318
  session->mem_root->free_root(MYF(memory::KEEP_PREALLOC));
319
319
 
320
320
  if (DRIZZLE_QUERY_DONE_ENABLED() || DRIZZLE_COMMAND_DONE_ENABLED())
321
321
  {
902
902
  {
903
903
    my_casedn_str(files_charset_info, table->db.str);
904
904
 
905
 
    SchemaIdentifier schema_identifier(string(table->db.str, table->db.length));
 
905
    SchemaIdentifier schema_identifier(string(table->db.str));
906
906
    if (not check_db_name(schema_identifier))
907
907
    {
908
908