← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/log.cc

  • Committer: Brian Aker
  • Date: 2008-11-13 02:56:15 UTC
  • mfrom: (575.4.10 devel)
  • Revision ID: brian@tangent.org-20081113025615-snhsi52yb2ivmx6f
Merging Monty's code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/log.cc
25
25
*/
26
26
 
27
27
#include <drizzled/server_includes.h>
28
 
#include <drizzled/sql_repl.h>
29
 
#include <drizzled/rpl_filter.h>
30
 
#include <drizzled/rpl_rli.h>
 
28
#include <drizzled/replication/replication.h>
 
29
#include <drizzled/replication/filter.h>
 
30
#include <drizzled/replication/rli.h>
31
31
 
32
32
#include <mysys/my_dir.h>
33
33
#include <stdarg.h>
2217
2217
 
2218
2218
  trx_data= (binlog_trx_data*) my_malloc(sizeof(binlog_trx_data), MYF(MY_ZEROFILL));
2219
2219
  if (!trx_data ||
2220
 
      open_cached_file(&trx_data->trans_log, mysql_tmpdir,
 
2220
      open_cached_file(&trx_data->trans_log, drizzle_tmpdir,
2221
2221
                       LOG_PREFIX, binlog_cache_size, MYF(MY_WME)))
2222
2222
  {
2223
2223
    free((unsigned char*)trx_data);