← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.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/session.cc
987
987
select_to_file::select_to_file(file_exchange *ex)
988
988
  : exchange(ex),
989
989
    file(-1),
990
 
    cache(static_cast<internal::IO_CACHE *>(memory::sql_calloc(sizeof(internal::IO_CACHE)))),
 
990
    cache(static_cast<internal::io_cache_st *>(memory::sql_calloc(sizeof(internal::io_cache_st)))),
991
991
    row_count(0L)
992
992
{
993
993
  path= "";
1027
1027
static int create_file(Session *session,
1028
1028
                       fs::path &target_path,
1029
1029
                       file_exchange *exchange,
1030
 
                       internal::IO_CACHE *cache)
 
1030
                       internal::io_cache_st *cache)
1031
1031
{
1032
1032
  fs::path to_file(exchange->file_name);
1033
1033
  int file;