← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/log_event.cc

  • Committer: Mats Kindahl
  • Date: 2008-08-07 06:24:22 UTC
  • mfrom: (265 drizzle)
  • mto: (264.1.19 codestyle)
  • mto: This revision was merged to the branch mainline in revision 266.
  • Revision ID: mats@mysql.com-20080807062422-20kyv6ssp4grfm0s
Manual merge of lp:drizzle into ~mkindahl/remove-mem-casts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/log_event.cc
31
31
#include "rpl_filter.h"
32
32
#include "rpl_utility.h"
33
33
#include "rpl_record.h"
34
 
#include <my_dir.h>
 
34
#include <mysys/my_dir.h>
 
35
#include <drizzled/drizzled_error_messages.h>
35
36
 
36
37
#endif /* MYSQL_CLIENT */
37
38
 
132
133
  char buff[MAX_SLAVE_ERRMSG], *slider;
133
134
  const char *buff_end= buff + sizeof(buff);
134
135
  uint len;
135
 
  List_iterator_fast<MYSQL_ERROR> it(thd->warn_list);
136
 
  MYSQL_ERROR *err;
 
136
  List_iterator_fast<DRIZZLE_ERROR> it(thd->warn_list);
 
137
  DRIZZLE_ERROR *err;
137
138
  buff[0]= 0;
138
139
 
139
140
  for (err= it++, slider= buff; err && slider < buff_end - 1;
465
466
  else
466
467
  {
467
468
    *ptr++= '\'';
468
 
    ptr+= escape_string_for_mysql(csinfo, ptr, 0,
469
 
                                  from->ptr(), from->length());
 
469
    ptr+= escape_string_for_drizzle(csinfo, ptr, 0,
 
470
                                    from->ptr(), from->length());
470
471
    *ptr++='\'';
471
472
  }
472
473
  to->length(orig_len + ptr - beg);
3575
3576
      "data truncated" warning but which is absorbed and never gets to the
3576
3577
      error log); still we init it to avoid a Valgrind message.
3577
3578
    */
3578
 
    mysql_reset_errors(thd, 0);
 
3579
    drizzle_reset_errors(thd, 0);
3579
3580
 
3580
3581
    TABLE_LIST tables;
3581
3582
    memset(&tables, 0, sizeof(tables));
7399
7400
     values filled in and one flag to handle the case that the default
7400
7401
     values should be checked. Maybe these two flags can be combined.
7401
7402
  */
7402
 
  if ((error= prepare_record(table, &m_cols, m_width,
7403
 
                             table->file->ht->db_type != DB_TYPE_NDBCLUSTER)))
 
7403
  if ((error= prepare_record(table, &m_cols, m_width, true)))
7404
7404
    return(error);
7405
7405
  
7406
7406
  /* unpack row into table->record[0] */