← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_update.cc

  • Committer: Lee Bieber
  • Date: 2011-02-18 23:49:00 UTC
  • mfrom: (2182.1.4 build)
  • Revision ID: kalebral@gmail.com-20110218234900-7zxzvw9x7e7zwflr
Merge Brian - add safe_delete()
Merge Stewart - 720552: doStartIndexScan return code ignored in optimizer::sum_query() for MIN() optimization 
Merge Olaf - add register keyword
Merge Patrick - 720813: syntax error in dbqp that is breaking it

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_update.cc
330
330
        Filesort has already found and selected the rows we want to update,
331
331
        so we don't need the where clause
332
332
      */
333
 
      delete select;
334
 
      select= 0;
 
333
      safe_delete(select);
335
334
    }
336
335
    else
337
336
    {
409
408
      /* Change select to use tempfile */
410
409
      if (select)
411
410
      {
412
 
        delete select->quick;
 
411
        safe_delete(select->quick);
413
412
        if (select->free_cond)
414
413
          delete select->cond;
415
 
        select->quick=0;
416
414
        select->cond=0;
417
415
      }
418
416
      else