← 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: 2009-01-23 02:15:04 UTC
  • mfrom: (798.2.32 drizzle)
  • Revision ID: brian@tangent.org-20090123021504-2j99e6hxab1ew601
Merge for replication removal.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_load.cc
18
18
 
19
19
#include <drizzled/server_includes.h>
20
20
#include <drizzled/sql_load.h>
21
 
#include <drizzled/replication/replication.h>
22
21
#include <drizzled/error.h>
23
22
#include <drizzled/data_home.h>
24
23
#include <drizzled/session.h>
250
249
 
251
250
  if (read_file_from_client)
252
251
  {
253
 
    (void)net_request_file(&session->net,ex->file_name);
 
252
    assert(0);
254
253
    file = -1;
255
254
  }
256
255
  else
807
806
 
808
807
      if (get_it_from_net)
809
808
        cache.read_function = _my_b_net_read;
810
 
 
811
 
      if (drizzle_bin_log.is_open())
812
 
        cache.pre_read = cache.pre_close =
813
 
          (IO_CACHE_CALLBACK) log_loaded_block;
814
809
    }
815
810
  }
816
811
}