← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/log_event.cc

  • Committer: Brian Aker
  • Date: 2008-09-04 18:16:51 UTC
  • Revision ID: brian@tangent.org-20080904181651-kydoxckk145z99b8
strend remove

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/log_event.cc
333
333
  fn_format(buf,"SQL_LOAD-",slave_load_tmpdir, "", MY_UNPACK_FILENAME);
334
334
  to_unix_path(buf);
335
335
 
336
 
  buf = strend(buf);
337
 
  buf = int10_to_str(::server_id, buf, 10);
 
336
  buf= strchr(buf, '\0');
 
337
  buf= int10_to_str(::server_id, buf, 10);
338
338
  *buf++ = '-';
339
 
  buf = int10_to_str(event_server_id, buf, 10);
 
339
  buf= int10_to_str(event_server_id, buf, 10);
340
340
  *buf++ = '-';
341
341
  res= int10_to_str(file_id, buf, 10);
342
342
  stpcpy(res, ext);                             // Add extension last
5758
5758
  p+= fn_pos_start;
5759
5759
  fname= (p= strmake(p, STRING_WITH_LEN(" INFILE \'")));
5760
5760
  p= slave_load_file_stem(p, file_id, server_id, ".data");
5761
 
  fname_end= p= strend(p);                      // Safer than p=p+5
 
5761
  fname_end= p= strchr(p, '\0');                      // Safer than p=p+5
5762
5762
  *(p++)='\'';
5763
5763
  switch (dup_handling) {
5764
5764
  case LOAD_DUP_IGNORE: