← Back to branch summary

~jlukas79/+junk/mysql-server

« back to all changes in this revision

Viewing changes to client/mysqlslap.c

manual merge 6.0-main --> 6.0-bka-review

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/mysqlslap.c
373
373
 
374
374
  slap_connect(&mysql, FALSE);
375
375
 
376
 
  VOID(pthread_mutex_init(&counter_mutex, NULL));
377
 
  VOID(pthread_cond_init(&count_threshhold, NULL));
378
 
  VOID(pthread_mutex_init(&sleeper_mutex, NULL));
379
 
  VOID(pthread_cond_init(&sleep_threshhold, NULL));
380
 
  VOID(pthread_mutex_init(&timer_alarm_mutex, NULL));
381
 
  VOID(pthread_cond_init(&timer_alarm_threshold, NULL));
 
376
  pthread_mutex_init(&counter_mutex, NULL);
 
377
  pthread_cond_init(&count_threshhold, NULL);
 
378
  pthread_mutex_init(&sleeper_mutex, NULL);
 
379
  pthread_cond_init(&sleep_threshhold, NULL);
 
380
  pthread_mutex_init(&timer_alarm_mutex, NULL);
 
381
  pthread_cond_init(&timer_alarm_threshold, NULL);
382
382
 
383
383
 
384
384
  /* Main iterations loop */
414
414
  if (opt_burnin)
415
415
    goto burnin;
416
416
 
417
 
  VOID(pthread_mutex_destroy(&counter_mutex));
418
 
  VOID(pthread_cond_destroy(&count_threshhold));
419
 
  VOID(pthread_mutex_destroy(&sleeper_mutex));
420
 
  VOID(pthread_cond_destroy(&sleep_threshhold));
421
 
  VOID(pthread_mutex_destroy(&timer_alarm_mutex));
422
 
  VOID(pthread_cond_destroy(&timer_alarm_threshold));
 
417
  pthread_mutex_destroy(&counter_mutex);
 
418
  pthread_cond_destroy(&count_threshhold);
 
419
  pthread_mutex_destroy(&sleeper_mutex);
 
420
  pthread_cond_destroy(&sleep_threshhold);
 
421
  pthread_mutex_destroy(&timer_alarm_mutex);
 
422
  pthread_cond_destroy(&timer_alarm_threshold);
423
423
 
424
424
  slap_close(&mysql);
425
425
 
615
615
    OPT_ARG, 0, 0, 0, 0, 0, 0},
616
616
#ifdef DBUG_OFF
617
617
  {"debug", '#', "This is a non-debug version. Catch this and exit.",
618
 
    0, 0, 0, GET_DISABLED, OPT_ARG, 0, 0, 0, 0, 0, 0},
 
618
   0, 0, 0, GET_DISABLED, OPT_ARG, 0, 0, 0, 0, 0, 0},
619
619
#else
620
620
  {"debug", '#', "Output debug log. Often this is 'd:t:o,filename'.",
621
621
    (uchar**) &default_dbug_option, (uchar**) &default_dbug_option, 0, GET_STR,
622
622
    OPT_ARG, 0, 0, 0, 0, 0, 0},
623
623
#endif
624
 
  {"debug-check", OPT_DEBUG_CHECK, "Check memory and open file usage at exit .",
 
624
  {"debug-check", OPT_DEBUG_CHECK, "Check memory and open file usage at exit.",
625
625
   (uchar**) &debug_check_flag, (uchar**) &debug_check_flag, 0,
626
626
   GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
627
627
  {"debug-info", 'T', "Print some debug info at exit.", (uchar**) &debug_info_flag,