← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/include/univ.i

  • Committer: Brian Aker
  • Date: 2010-12-08 22:35:56 UTC
  • mfrom: (1819.9.158 update-innobase)
  • Revision ID: brian@tangent.org-20101208223556-37mi4omqg7lkjzf3
Merge in Stewart's changes, 1.3 changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/include/univ.i
52
52
 
53
53
#define INNODB_VERSION_MAJOR    1
54
54
#define INNODB_VERSION_MINOR    1
55
 
#define INNODB_VERSION_BUGFIX   2
 
55
#define INNODB_VERSION_BUGFIX   3
56
56
 
57
57
/* The following is the InnoDB version as shown in
58
58
SELECT plugin_version FROM information_schema.plugins;
84
84
# define ha_innobase ha_innodb
85
85
#endif /* MYSQL_DYNAMIC_PLUGIN */
86
86
 
87
 
/* if any of the following macros are not defined we are missing fundamental
88
 
 * and important symbols
89
 
 */
90
 
#if !defined(HAVE_GCC_ATOMIC_BUILTINS) \
91
 
 && !defined(HAVE_IB_ATOMIC_PTHREAD_T_GCC) \
92
 
 && !defined(HAVE_SOLARIS_ATOMICS) \
93
 
 && !defined(HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS) \
94
 
 && !defined(SIZEOF_PTHREAD_T) \
95
 
 && !defined(IB_HAVE_PAUSE_INSTRUCTION)
96
 
# error There is a problem in the configure setup
97
 
#endif
98
 
 
99
87
#if (defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)) && !defined(MYSQL_SERVER) && !defined(__WIN__)
100
88
# undef __WIN__
101
89
# define __WIN__