← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_lex.cc

  • Committer: Jay Pipes
  • Date: 2008-09-26 11:21:06 UTC
  • mfrom: (407 drizzle)
  • mto: This revision was merged to the branch mainline in revision 408.
  • Revision ID: jay@mysql.com-20080926112106-hpr4733uh22a5grz
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_lex.cc
371
371
                     lex->plugins.elements);
372
372
  reset_dynamic(&lex->plugins);
373
373
 
 
374
  delete lex->result;
 
375
  lex->result= 0;
 
376
 
374
377
  return;
375
378
}
376
379
 
1564
1567
  select_n_having_items= 0;
1565
1568
  subquery_in_having= explicit_limit= 0;
1566
1569
  is_item_list_lookup= 0;
1567
 
  first_execution= 1;
1568
 
  first_cond_optimization= 1;
1569
1570
  parsing_place= NO_MATTER;
1570
1571
  exclude_from_table_unique_test= false;
1571
1572
  nest_level= 0;
1930
1931
  if (ref_pointer_array)
1931
1932
    return 0;
1932
1933
 
1933
 
  /*
1934
 
    We have to create array in prepared statement memory if it is
1935
 
    prepared statement
1936
 
  */
1937
 
  Query_arena *arena= thd->stmt_arena;
1938
1934
  return (ref_pointer_array=
1939
 
          (Item **)arena->alloc(sizeof(Item*) * (n_child_sum_items +
 
1935
          (Item **)thd->alloc(sizeof(Item*) * (n_child_sum_items +
1940
1936
                                                 item_list.elements +
1941
1937
                                                 select_n_having_items +
1942
1938
                                                 select_n_where_fields +