← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_update.cc

  • Committer: Brian Aker
  • Date: 2010-11-07 00:54:27 UTC
  • mfrom: (1909.1.2 merge)
  • Revision ID: brian@tangent.org-20101107005427-a3kcx1lytrm36a97
Rollup merge of iocache work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_update.cc
341
341
      */
342
342
 
343
343
      internal::IO_CACHE tempfile;
344
 
      if (open_cached_file(&tempfile, drizzle_tmpdir.c_str(),TEMP_PREFIX,
345
 
                           DISK_BUFFER_SIZE, MYF(MY_WME)))
 
344
      if (tempfile.open_cached_file(drizzle_tmpdir.c_str(),TEMP_PREFIX, DISK_BUFFER_SIZE, MYF(MY_WME)))
 
345
      {
346
346
        goto err;
 
347
      }
347
348
 
348
349
      /* If quick select is used, initialize it before retrieving rows. */
349
350
      if (select && select->quick && select->quick->reset())
416
417
        select= new optimizer::SqlSelect;
417
418
        select->head=table;
418
419
      }
419
 
      if (reinit_io_cache(&tempfile,internal::READ_CACHE,0L,0,0))
 
420
      if (tempfile.reinit_io_cache(internal::READ_CACHE,0L,0,0))
420
421
        error=1;
421
422
      // Read row ptrs from this cursor
422
423
      memcpy(select->file, &tempfile, sizeof(tempfile));