← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/log_event.cc

  • Committer: Toru Maesaka
  • Date: 2008-12-01 11:00:41 UTC
  • mto: (632.1.17 devel)
  • mto: This revision was merged to the branch mainline in revision 637.
  • Revision ID: dev@torum.net-20081201110041-gia57w4pw4qwh13t
Third pass of replacing MySQL's strmake() with libc calls

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/log_event.cc
332
332
     we cannot meet Start_log event in the middle of events from one 
333
333
     LOAD DATA.
334
334
  */
335
 
  p= strmake(prefbuf, STRING_WITH_LEN("SQL_LOAD-"));
 
335
  p= strncpy(prefbuf, STRING_WITH_LEN("SQL_LOAD-")+1) + 9;
336
336
  p= int10_to_str(::server_id, p, 10);
337
337
  *(p++)= '-';
338
338
  *p= 0;
3930
3930
  p= buf;
3931
3931
  memcpy(p, query, fn_pos_start);
3932
3932
  p+= fn_pos_start;
3933
 
  fname= (p= strmake(p, STRING_WITH_LEN(" INFILE \'")));
 
3933
  fname= (p= strncpy(p, STRING_WITH_LEN(" INFILE \'")+1) + 9);
3934
3934
  p= slave_load_file_stem(p, file_id, server_id, ".data");
3935
3935
  fname_end= p= strchr(p, '\0');                      // Safer than p=p+5
3936
3936
  *(p++)='\'';
3937
3937
  switch (dup_handling) {
3938
3938
  case LOAD_DUP_IGNORE:
3939
 
    p= strmake(p, STRING_WITH_LEN(" IGNORE"));
 
3939
    p= strncpy(p, STRING_WITH_LEN(" IGNORE")+1) + 7;
3940
3940
    break;
3941
3941
  case LOAD_DUP_REPLACE:
3942
 
    p= strmake(p, STRING_WITH_LEN(" REPLACE"));
 
3942
    p= strncpy(p, STRING_WITH_LEN(" REPLACE")+1) + 8;
3943
3943
    break;
3944
3944
  default:
3945
3945
    /* Ordinary load data */
3946
3946
    break;
3947
3947
  }
3948
 
  p= strmake(p, STRING_WITH_LEN(" INTO"));
3949
 
  p= strmake(p, query+fn_pos_end, q_len-fn_pos_end);
 
3948
  size_t end_len = q_len-fn_pos_end;
 
3949
  p= strncpy(p, STRING_WITH_LEN(" INTO")+1) + 5;
 
3950
  p= strncpy(p, query+fn_pos_end, end_len);
 
3951
  p+= end_len;
3950
3952
 
3951
3953
  error= Query_log_event::do_apply_event(rli, buf, p-buf);
3952
3954