← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/ut/ut0ut.c

  • Committer: Monty Taylor
  • Date: 2009-08-17 18:46:08 UTC
  • mto: (1182.1.1 staging)
  • mto: This revision was merged to the branch mainline in revision 1183.
  • Revision ID: mordred@inaugust.com-20090817184608-0b2emowpjr9m6le7
"Fixed" the deadlock test. I'd still like someone to look at what's going on here.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/ut/ut0ut.c
43
43
#ifndef UNIV_HOTBACKUP
44
44
# include "trx0trx.h"
45
45
# if defined(BUILD_DRIZZLE)
46
 
#  include "drizzled/common.h"
 
46
#  include <drizzled/common.h>
47
47
#  if TIME_WITH_SYS_TIME
48
48
#   include <sys/time.h>
49
49
#   include <time.h>
59
59
#  include "mysql_com.h" /* NAME_LEN */
60
60
# endif /* DRIZZLE */
61
61
#endif /* UNIV_HOTBACKUP */
62
 
#include <errno.h>
63
 
#include <assert.h>
64
62
 
65
63
/** A constant to prevent the compiler from optimizing ut_delay() away. */
66
64
UNIV_INTERN ibool       ut_always_false = FALSE;