~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_union.cc

  • Committer: Jay Pipes
  • Date: 2009-05-29 20:03:54 UTC
  • mto: This revision was merged to the branch mainline in revision 1043.
  • Revision ID: jpipes@serialcoder-20090529200354-tg0rb1nu3ojf95mn
First phase refactoring the JOIN class:

* Pulled out the init() method
* Created proper, ordered initialization list for JOIN constructor
* Initialized all member variables in initialization list (this will enable us to move towards using new for JOIN properly)
* Moved member variables around in the class to fit more-frequently accessed attributes
  in the first part of the class, which should fix some of the large number of I2mr and D2mr
  cache misses I've found in JOIN::optimize() and JOIN::prepare.
* Style cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
556
556
            subquery execution rather than EXPLAIN line production. In order
557
557
            to reset them back, we re-do all of the actions (yes it is ugly):
558
558
          */
559
 
          join->init(session, item_list, fake_select_lex->options, result);
 
559
                join->reset(session, item_list, fake_select_lex->options, result);
560
560
          saved_error= mysql_select(session, &fake_select_lex->ref_pointer_array,
561
561
                                &result_table_list,
562
562
                                0, item_list, NULL,