← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_lex.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/sql_lex.cc
276
276
  delete lex->result;
277
277
 
278
278
  lex->result= 0;
 
279
  lex->setCacheable(true);
279
280
 
280
281
  if (lex->statement) 
281
282
    delete lex->statement;
1867
1868
    charset(NULL),
1868
1869
    sql_command(SQLCOM_END), 
1869
1870
    option_type(OPT_DEFAULT), 
1870
 
    is_lex_started(0)
 
1871
    is_lex_started(0),
 
1872
    cacheable(true)
1871
1873
{
1872
1874
  reset_query_tables_list(true);
1873
1875
  statement= NULL;