← Back to branch summary

~clint-fewbar/ubuntu/natty/drizzle/beta1-fixes

« back to all changes in this revision

Viewing changes to drizzled/sql_update.cc

  • Committer: Bazaar Package Importer
  • Author(s): Monty Taylor
  • Date: 2011-03-15 10:41:18 UTC
  • mfrom: (1.2.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20110315104118-eaf0hvlytjdl4zrf
Tags: 2011.03.13-0ubuntu1
* New upstream release.
* Added slave plugin.
* Removed archive, blackhole and blitzdb plugins.
* Moved location of libdrizzle headers.
* Removed drizzleadmin manpage patch.
* Add drizzle_safe_write_string to symbols.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_update.cc
34
34
#include <drizzled/filesort.h>
35
35
#include <drizzled/plugin/storage_engine.h>
36
36
#include <drizzled/key.h>
 
37
#include <drizzled/sql_lex.h>
37
38
 
38
39
#include <boost/dynamic_bitset.hpp>
39
40
#include <list>
147
148
  Table         *table;
148
149
  optimizer::SqlSelect *select= NULL;
149
150
  ReadRecord    info;
150
 
  Select_Lex    *select_lex= &session->getLex()->select_lex;
 
151
  Select_Lex    *select_lex= &session->lex().select_lex;
151
152
  uint64_t     id;
152
153
  List<Item> all_fields;
153
154
  Session::killed_state_t killed_status= Session::NOT_KILLED;
621
622
                         Item **conds, uint32_t order_num, Order *order)
622
623
{
623
624
  List<Item> all_fields;
624
 
  Select_Lex *select_lex= &session->getLex()->select_lex;
 
625
  Select_Lex *select_lex= &session->lex().select_lex;
625
626
 
626
 
  session->getLex()->allow_sum_func= 0;
 
627
  session->lex().allow_sum_func= 0;
627
628
 
628
629
  if (setup_tables_and_check_access(session, &select_lex->context,
629
630
                                    &select_lex->top_join_list,