~drizzle-trunk/drizzle/development

merge with latest from the trunk

added added

removed removed

610

bool error=1;

611

612

/* Open cached file if it isn't open */

613

outfile=table->sort.io_cache=(IO_CACHE*) malloc(sizeof(IO_CACHE));

613

outfile=table->sort.io_cache= new IO_CACHE;

614

memset(outfile, 0, sizeof(IO_CACHE));

615

616

if (!outfile || (! my_b_inited(outfile) && open_cached_file(outfile,drizzle_tmpdir,TEMP_PREFIX,READ_RECORD_BUFFER, MYF(MY_WME))))

617

return 1;

618

reinit_io_cache(outfile,WRITE_CACHE,0L,0,0);

618

reinit_io_cache(outfile, WRITE_CACHE, 0L, 0, 0);

619

620

memset(&sort_param, 0, sizeof(sort_param));

621

sort_param.max_rows= elements;