← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/insert_select.cc

  • Committer: Brian Aker
  • Date: 2011-02-12 06:56:00 UTC
  • mto: This revision was merged to the branch mainline in revision 2161.
  • Revision ID: brian@tangent.org-20110212065600-m6c68fybw51rflhj
Further strip out includes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/insert_select.cc
18
18
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 */
20
20
 
21
 
#include <config.h>
 
21
#include "config.h"
22
22
#include <drizzled/show.h>
23
23
#include <drizzled/lock.h>
24
24
#include <drizzled/session.h>
25
25
#include <drizzled/probes.h>
26
26
#include <drizzled/statement/insert_select.h>
27
 
#include <drizzled/select_insert.h>
28
27
 
29
28
namespace drizzled
30
29
{
31
30
 
32
31
bool statement::InsertSelect::execute()
33
32
{
34
 
  TableList *first_table= (TableList *) getSession()->getLex()->select_lex.table_list.first;
35
 
  TableList *all_tables= getSession()->getLex()->query_tables;
 
33
  TableList *first_table= (TableList *) getSession()->lex->select_lex.table_list.first;
 
34
  TableList *all_tables= getSession()->lex->query_tables;
36
35
  assert(first_table == all_tables && first_table != 0);
37
 
  Select_Lex *select_lex= &getSession()->getLex()->select_lex;
38
 
  Select_Lex_Unit *unit= &getSession()->getLex()->unit;
 
36
  Select_Lex *select_lex= &getSession()->lex->select_lex;
 
37
  Select_Lex_Unit *unit= &getSession()->lex->unit;
39
38
  select_result *sel_result= NULL;
40
39
  bool res= false;
41
40
  bool need_start_waiting= false;
66
65
    res= insert_select_prepare(getSession());
67
66
    if (! res && (sel_result= new select_insert(first_table,
68
67
                                                first_table->table,
69
 
                                                &getSession()->getLex()->field_list,
70
 
                                                &getSession()->getLex()->update_list,
71
 
                                                &getSession()->getLex()->value_list,
72
 
                                                getSession()->getLex()->duplicates,
73
 
                                                getSession()->getLex()->ignore)))
 
68
                                                &getSession()->lex->field_list,
 
69
                                                &getSession()->lex->update_list,
 
70
                                                &getSession()->lex->value_list,
 
71
                                                getSession()->lex->duplicates,
 
72
                                                getSession()->lex->ignore)))
74
73
    {
75
74
      res= handle_select(getSession(), 
76
 
                         getSession()->getLex(), 
 
75
                         getSession()->lex, 
77
76
                         sel_result, 
78
77
                         OPTION_SETUP_TABLES_DONE);
79
78