~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/update.cc

  • Committer: Lee Bieber
  • Date: 2011-02-11 20:30:05 UTC
  • mfrom: (2157.1.3 build)
  • Revision ID: kalebral@gmail.com-20110211203005-757o1y2yf78dxzqr
Merge Stewart - 716848: drizzleimport displays wrong program_name
Merge Stewart - update README file
Merge Andrew and Joe - Exposes the InnoDB SYS_REPLICATION_LOG to data_dictionary so that it is fast and fixes many issues we have been having

Show diffs side-by-side

added added

removed removed

Lines of Context:
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/session.h>
24
24
#include <drizzled/statement/update.h>
28
28
 
29
29
bool statement::Update::execute()
30
30
{
31
 
  TableList *first_table= (TableList *) getSession()->getLex()->select_lex.table_list.first;
32
 
  TableList *all_tables= getSession()->getLex()->query_tables;
 
31
  TableList *first_table= (TableList *) getSession()->lex->select_lex.table_list.first;
 
32
  TableList *all_tables= getSession()->lex->query_tables;
33
33
  assert(first_table == all_tables && first_table != 0);
34
 
  Select_Lex *select_lex= &getSession()->getLex()->select_lex;
35
 
  Select_Lex_Unit *unit= &getSession()->getLex()->unit;
 
34
  Select_Lex *select_lex= &getSession()->lex->select_lex;
 
35
  Select_Lex_Unit *unit= &getSession()->lex->unit;
36
36
  if (update_precheck(getSession(), all_tables))
37
37
  {
38
38
    return true;
42
42
  bool res= update_query(getSession(), 
43
43
                         all_tables,
44
44
                         select_lex->item_list,
45
 
                         getSession()->getLex()->value_list,
 
45
                         getSession()->lex->value_list,
46
46
                         select_lex->where,
47
47
                         select_lex->order_list.elements,
48
48
                         (Order *) select_lex->order_list.first,
49
49
                         unit->select_limit_cnt,
50
 
                         getSession()->getLex()->duplicates, 
51
 
                         getSession()->getLex()->ignore);
 
50
                         getSession()->lex->duplicates, 
 
51
                         getSession()->lex->ignore);
52
52
  return res;
53
53
}
54
54