bzr push into mysql-trunk-innodb branch (vasil.dimov:3441 to 3442)

[vasil.dimov]

 3442 Vasil Dimov	2011-01-19
      Rename the C macros for MySQL version to be consistent with CMake variables
      
      Also set InnoDB version automatically from MySQL version so I do not have
      to adjust it every time after a release. If the versions ever go out of
      sync, then the InnoDB version can be adjusted in univ.i.

    modified:
      config.h.cmake
      storage/innobase/include/univ.i
 3441 Marko Mäkelä	2011-01-19
      Make UNIV_SYNC_DEBUG a notch stricter after WL#5458.
      
      srv_init(): Assign a latch level to srv_sys->tasks_mutex.
      
      sync_thread_add_level(): Assert that the thread must own the lock_sys->mutex
      in order to be able to acquire multiple trx->mutex.

    modified:
      storage/innobase/srv/srv0srv.c
      storage/innobase/sync/sync0sync.c
=== modified file 'config.h.cmake'
--- a/config.h.cmake	revid:marko.makela@stripped347-j6uhwoi0jjge8din
+++ b/config.h.cmake	revid:vasil.dimov@stripped
@@ -602,8 +602,10 @@
 
 #cmakedefine SO_EXT "@CMAKE_SHARED_MODULE_SUFFIX@"
 
-#define MYSQL_MAJOR_VERSION @MAJOR_VERSION@
-#define MYSQL_MINOR_VERSION @MINOR_VERSION@
+#define MYSQL_VERSION_MAJOR @MAJOR_VERSION@
+#define MYSQL_VERSION_MINOR @MINOR_VERSION@
+#define MYSQL_VERSION_PATCH @PATCH_VERSION@
+#define MYSQL_VERSION_EXTRA "@EXTRA_VERSION@"
 
 #define PACKAGE "mysql"
 #define PACKAGE_BUGREPORT ""

=== modified file 'storage/innobase/include/univ.i'
--- a/storage/innobase/include/univ.i	revid:marko.makela@strippedom-20110119121347-j6uhwoi0jjge8din
+++ b/storage/innobase/include/univ.i	revid:vasil.dimov@stripped39-0or7eg74usmrnpcb
@@ -51,7 +51,7 @@ Created 1/20/1994 Heikki Tuuri
 
 #define INNODB_VERSION_MAJOR	1
 #define INNODB_VERSION_MINOR	2
-#define INNODB_VERSION_BUGFIX	1
+#define INNODB_VERSION_BUGFIX	MYSQL_VERSION_PATCH
 
 /* The following is the InnoDB version as shown in
 SELECT plugin_version FROM information_schema.plugins;
@@ -68,8 +68,8 @@ component, i.e. we show M.N.P as M.N */
 	IB_TO_STR(INNODB_VERSION_BUGFIX)
 
 #define REFMAN "http://dev.mysql.com/doc/refman/"	\
-	IB_TO_STR(MYSQL_MAJOR_VERSION) "."		\
-	IB_TO_STR(MYSQL_MINOR_VERSION) "/en/"
+	IB_TO_STR(MYSQL_VERSION_MAJOR) "."		\
+	IB_TO_STR(MYSQL_VERSION_MINOR) "/en/"
 
 #ifdef MYSQL_DYNAMIC_PLUGIN
 /* In the dynamic plugin, redefine some externally visible symbols

No bundle (reason: useless for push emails).