← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_update.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_update.cc
27
27
#include "drizzled/sql_parse.h"
28
28
#include "drizzled/optimizer/range.h"
29
29
#include "drizzled/records.h"
 
30
#include "drizzled/internal/my_sys.h"
 
31
#include "drizzled/internal/iocache.h"
30
32
 
31
33
#include <list>
32
34
 
388
390
      }
389
391
      if (reinit_io_cache(&tempfile,READ_CACHE,0L,0,0))
390
392
        error=1;
391
 
      select->file= tempfile;                   // Read row ptrs from this cursor
 
393
      // Read row ptrs from this cursor
 
394
      memcpy(select->file, &tempfile, sizeof(tempfile));
392
395
      if (error >= 0)
393
396
        goto err;
394
397
    }