~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/log_event.cc

  • Committer: Brian Aker
  • Date: 2008-10-08 02:28:58 UTC
  • mfrom: (489.1.13 codestyle)
  • Revision ID: brian@tangent.org-20081008022858-ea8esagkxmn0dupc
Merge of Monty's work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
4048
4048
  memset(&file, 0, sizeof(file));
4049
4049
  fname_buf= my_stpcpy(proc_info, "Making temp file ");
4050
4050
  ext= slave_load_file_stem(fname_buf, file_id, server_id, ".info");
4051
 
  thd_proc_info(thd, proc_info);
 
4051
  thd->set_proc_info(proc_info);
4052
4052
  my_delete(fname_buf, MYF(0)); // old copy may exist already
4053
4053
  if ((fd= my_create(fname_buf, CREATE_MODE,
4054
4054
                     O_WRONLY | O_BINARY | O_EXCL | O_NOFOLLOW,
4101
4101
    end_io_cache(&file);
4102
4102
  if (fd >= 0)
4103
4103
    my_close(fd, MYF(0));
4104
 
  thd_proc_info(thd, 0);
 
4104
  thd->set_proc_info(0);
4105
4105
  return error == 0;
4106
4106
}
4107
4107
 
4195
4195
 
4196
4196
  fname= my_stpcpy(proc_info, "Making temp file ");
4197
4197
  slave_load_file_stem(fname, file_id, server_id, ".data");
4198
 
  thd_proc_info(thd, proc_info);
 
4198
  thd->set_proc_info(proc_info);
4199
4199
  if (get_create_or_append())
4200
4200
  {
4201
4201
    my_delete(fname, MYF(0)); // old copy may exist already
4229
4229
err:
4230
4230
  if (fd >= 0)
4231
4231
    my_close(fd, MYF(0));
4232
 
  thd_proc_info(thd, 0);
 
4232
  thd->set_proc_info(0);
4233
4233
  return(error);
4234
4234
}
4235
4235