bzr commit into mysql-trunk-innodb branch (vasil.dimov:3523)

[vasil.dimov]

#At file:///usr/local/devel/bzrroot/server/mysql-trunk-innodb/ based on revid:jimmy.yang@stripped

 3523 Vasil Dimov	2011-02-28 [merge]
      Merge mysql-5.5-innodb -> mysql-trunk-innodb

    modified:
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/handler/i_s.cc
      storage/innobase/handler/i_s.h
=== modified file 'storage/innobase/handler/ha_innodb.cc'
--- a/storage/innobase/handler/ha_innodb.cc	revid:jimmy.yang@stripped
+++ b/storage/innobase/handler/ha_innodb.cc	revid:vasil.dimov@stripped
@@ -12519,7 +12519,7 @@ mysql_declare_plugin(innobase)
   MYSQL_STORAGE_ENGINE_PLUGIN,
   &innobase_storage_engine,
   innobase_hton_name,
-  "Innobase Oy",
+  plugin_author,
   "Supports transactions, row-level locking, and foreign keys",
   PLUGIN_LICENSE_GPL,
   innobase_init, /* Plugin Init */

=== modified file 'storage/innobase/handler/i_s.cc'
--- a/storage/innobase/handler/i_s.cc	revid:jimmy.yang@stripped
+++ b/storage/innobase/handler/i_s.cc	revid:vasil.dimov@stripped
@@ -52,8 +52,6 @@ extern "C" {
 #include "page0zip.h"
 }
 
-static const char plugin_author[] = "Oracle Corporation";
-
 /** structure associates a name string with a file page type and/or buffer
 page state. */
 struct buffer_page_desc_str_struct{
@@ -1158,7 +1156,7 @@ UNIV_INTERN struct st_mysql_plugin	i_s_i
 
 	/* plugin author (for SHOW PLUGINS) */
 	/* const char* */
-	STRUCT_FLD(author, "Innobase Oy"),
+	STRUCT_FLD(author, plugin_author),
 
 	/* general descriptive text (for SHOW PLUGINS) */
 	/* const char* */
@@ -2356,7 +2354,7 @@ UNIV_INTERN struct st_mysql_plugin	i_s_i
 
 	/* plugin author (for SHOW PLUGINS) */
 	/* const char* */
-	STRUCT_FLD(author, "Oracle and/or its affiliates."),
+	STRUCT_FLD(author, plugin_author),
 
 	/* general descriptive text (for SHOW PLUGINS) */
 	/* const char* */

=== modified file 'storage/innobase/handler/i_s.h'
--- a/storage/innobase/handler/i_s.h	revid:jimmy.yang@stripped
+++ b/storage/innobase/handler/i_s.h	revid:vasil.dimov@stripped
@@ -26,6 +26,8 @@ Created July 18, 2007 Vasil Dimov
 #ifndef i_s_h
 #define i_s_h
 
+const char plugin_author[] = "Oracle Corporation";
+
 extern struct st_mysql_plugin	i_s_innodb_trx;
 extern struct st_mysql_plugin	i_s_innodb_locks;
 extern struct st_mysql_plugin	i_s_innodb_lock_waits;

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).