bzr push into mysql-trunk-innodb branch (vasil.dimov:3380 to 3381)

[vasil.dimov]

 3381 Vasil Dimov	2010-12-13
      Increment InnoDB version from 1.2.0 to 1.2.1
      
      InnoDB 1.2.0 was not released to public, but we want to be
      in line with MySQL version which is now at 5.6.1.
      
      Suggested by:	Calvin Sun

    modified:
      storage/innobase/include/univ.i
 3380 Vasil Dimov	2010-12-13 [merge]
      Merge mysql-trunk-innodb from bk-internal into my local repo

    modified:
      mysql-test/suite/innodb/r/innodb_information_schema_buffer.result
      mysql-test/suite/innodb/t/innodb_information_schema_buffer.test
=== modified file 'storage/innobase/include/univ.i'
--- a/storage/innobase/include/univ.i	revid:vasil.dimov@stripped
+++ b/storage/innobase/include/univ.i	revid:vasil.dimov@stripped
@@ -51,7 +51,7 @@ Created 1/20/1994 Heikki Tuuri
 
 #define INNODB_VERSION_MAJOR	1
 #define INNODB_VERSION_MINOR	2
-#define INNODB_VERSION_BUGFIX	0
+#define INNODB_VERSION_BUGFIX	1
 
 /* The following is the InnoDB version as shown in
 SELECT plugin_version FROM information_schema.plugins;

No bundle (reason: useless for push emails).