← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_update.cc

  • Committer: Mark Atwood
  • Date: 2011-04-29 00:19:38 UTC
  • mto: This revision was merged to the branch mainline in revision 2297.
  • Revision ID: me@mark.atwood.name-20110429001938-ps5i74hzcic7dvr3
Merge in Fixes of Brian's IOCACHE.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_update.cc
322
322
      ha_rows examined_rows;
323
323
      FileSort filesort(*session);
324
324
 
325
 
      table->sort.io_cache= new internal::IO_CACHE;
 
325
      table->sort.io_cache= new internal::io_cache_st;
326
326
 
327
327
      if (!(sortorder=make_unireg_sortorder(order, &length, NULL)) ||
328
328
          (table->sort.found_records= filesort.run(table, sortorder, length,
345
345
        update these in a separate loop based on the pointer.
346
346
      */
347
347
 
348
 
      internal::IO_CACHE tempfile;
 
348
      internal::io_cache_st tempfile;
349
349
      if (tempfile.open_cached_file(drizzle_tmpdir.c_str(),TEMP_PREFIX, DISK_BUFFER_SIZE, MYF(MY_WME)))
350
350
      {
351
351
        goto err;