← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_update.cc

merge with latest from the trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_update.cc
337
337
      SORT_FIELD  *sortorder;
338
338
      ha_rows examined_rows;
339
339
 
340
 
      table->sort.io_cache = (IO_CACHE *) malloc(sizeof(IO_CACHE));
 
340
      table->sort.io_cache = new IO_CACHE;
341
341
      memset(table->sort.io_cache, 0, sizeof(IO_CACHE));
342
342
 
343
343
      if (!(sortorder=make_unireg_sortorder(order, &length, NULL)) ||