← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/log_event.cc

  • Committer: Monty Taylor
  • Date: 2008-10-29 21:21:57 UTC
  • mto: (520.4.26 devel)
  • mto: This revision was merged to the branch mainline in revision 570.
  • Revision ID: monty@inaugust.com-20081029212157-y3127au8tj1jxfal
Moved a bunch of crap out of common_includes.
Killed innodb_plugin_extras.h.
Made kittens happy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/log_event.cc
37
37
#include <drizzled/error.h>
38
38
#include <drizzled/query_id.h>
39
39
#include <drizzled/tztime.h>
40
 
 
41
 
#define log_cs  &my_charset_utf8_general_ci
 
40
#include <drizzled/slave.h>
42
41
 
43
42
 
44
43
static const char *HA_ERR(int i)
2963
2962
      session->lex->duplicates= handle_dup;
2964
2963
 
2965
2964
      sql_exchange ex((char*)fname, sql_ex.opt_flags & DUMPFILE_FLAG);
2966
 
      String field_term(sql_ex.field_term,sql_ex.field_term_len,log_cs);
2967
 
      String enclosed(sql_ex.enclosed,sql_ex.enclosed_len,log_cs);
2968
 
      String line_term(sql_ex.line_term,sql_ex.line_term_len,log_cs);
2969
 
      String line_start(sql_ex.line_start,sql_ex.line_start_len,log_cs);
2970
 
      String escaped(sql_ex.escaped,sql_ex.escaped_len, log_cs);
 
2965
      String field_term(sql_ex.field_term,sql_ex.field_term_len,&my_charset_utf8_general_ci);
 
2966
      String enclosed(sql_ex.enclosed,sql_ex.enclosed_len,&my_charset_utf8_general_ci);
 
2967
      String line_term(sql_ex.line_term,sql_ex.line_term_len,&my_charset_utf8_general_ci);
 
2968
      String line_start(sql_ex.line_start,sql_ex.line_start_len,&my_charset_utf8_general_ci);
 
2969
      String escaped(sql_ex.escaped,sql_ex.escaped_len, &my_charset_utf8_general_ci);
2971
2970
      ex.field_term= &field_term;
2972
2971
      ex.enclosed= &enclosed;
2973
2972
      ex.line_term= &line_term;
3090
3089
void Rotate_log_event::pack_info(Protocol *protocol)
3091
3090
{
3092
3091
  char buf1[256], buf[22];
3093
 
  String tmp(buf1, sizeof(buf1), log_cs);
 
3092
  String tmp(buf1, sizeof(buf1), &my_charset_utf8_general_ci);
3094
3093
  tmp.length(0);
3095
3094
  tmp.append(new_log_ident, ident_len);
3096
3095
  tmp.append(STRING_WITH_LEN(";pos="));