Merge from parent.

fc3012c1 · Sunny Bains · dcdb6bb8 · c0a035cd · fc3012c1
Commit fc3012c1 authored Jun 17, 2010 by Sunny Bains
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

storage/innobase/include/univ.i storage/innobase/include/univ.i +1 -1

No files found.
--- a/storage/innobase/include/univ.i
+++ b/storage/innobase/include/univ.i
@@ -46,7 +46,7 @@ Created 1/20/1994 Heikki Tuuri
 #define INNODB_VERSION_MAJOR	1
 #define INNODB_VERSION_MINOR	1
-#define INNODB_VERSION_BUGFIX	1
+#define INNODB_VERSION_BUGFIX	2
 /* The following is the InnoDB version as shown in
 SELECT plugin_version FROM information_schema.plugins;