← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_load.cc

  • Committer: Brian Aker
  • Date: 2010-11-07 00:54:27 UTC
  • mfrom: (1909.1.2 merge)
  • Revision ID: brian@tangent.org-20101107005427-a3kcx1lytrm36a97
Rollup merge of iocache work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_load.cc
75
75
  */
76
76
  void end_io_cache()
77
77
  {
78
 
    internal::end_io_cache(&cache);
 
78
    cache.end_io_cache();
79
79
    need_end_io_cache = 0;
80
80
  }
81
81
 
795
795
  else
796
796
  {
797
797
    end_of_buff=buffer+buff_length;
798
 
    if (init_io_cache(&cache,(false) ? -1 : cursor, 0,
799
 
                      (false) ? internal::READ_NET :
800
 
                      (is_fifo ? internal::READ_FIFO : internal::READ_CACHE),0L,1,
801
 
                      MYF(MY_WME)))
 
798
    if (cache.init_io_cache((false) ? -1 : cursor, 0,
 
799
                            (false) ? internal::READ_NET :
 
800
                            (is_fifo ? internal::READ_FIFO : internal::READ_CACHE),0L,1,
 
801
                            MYF(MY_WME)))
802
802
    {
803
803
      free((unsigned char*) buffer);
804
804
      error=1;
821
821
  if (!error)
822
822
  {
823
823
    if (need_end_io_cache)
824
 
      internal::end_io_cache(&cache);
 
824
      cache.end_io_cache();
825
825
    free(buffer);
826
826
    error=1;
827
827
  }