← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/archive/concurrency_test.cc

  • Committer: Monty Taylor
  • Date: 2010-02-05 08:11:15 UTC
  • mfrom: (1283 build)
  • mto: (1273.13.43 fix_is)
  • mto: This revision was merged to the branch mainline in revision 1300.
  • Revision ID: mordred@inaugust.com-20100205081115-dr82nvrwv4lvw7sd
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/archive/concurrency_test.cc
102
102
{
103
103
 
104
104
  unsigned int method;
105
 
  my_init();
 
105
  drizzled::internal::my_init();
106
106
 
107
107
  MY_INIT(argv[0]);
108
108
 
192
192
    if (pthread_create(&mainthread, &attr, timer_thread,
193
193
                       (void *)&opt_timer_length) != 0)
194
194
    {
195
 
      fprintf(stderr,"%s: Could not create timer thread\n", my_progname);
 
195
      fprintf(stderr,"%s: Could not create timer thread\n", drizzled::internal::my_progname);
196
196
      exit(1);
197
197
    }
198
198
  }