← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_update.cc

Big merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_update.cc
134
134
  ha_rows       updated, found;
135
135
  key_map       old_covering_keys;
136
136
  Table         *table;
137
 
  optimizer::SQL_SELECT *select= NULL;
 
137
  optimizer::SqlSelect *select= NULL;
138
138
  READ_RECORD   info;
139
139
  Select_Lex    *select_lex= &session->lex->select_lex;
140
140
  uint64_t     id;
383
383
      }
384
384
      else
385
385
      {
386
 
        select= new optimizer::SQL_SELECT;
 
386
        select= new optimizer::SqlSelect;
387
387
        select->head=table;
388
388
      }
389
389
      if (reinit_io_cache(&tempfile,READ_CACHE,0L,0,0))