Import mysql-5.1-new changeset 1.2012.1.8 (Sergei Golubchik):

WL#2935 - SHOW STATUS support in plugins

ha_innodb.cc, ha_innodb.h: s/struct show_var_st/SHOW_VAR/

handler/ha_innodb.cc

@@ -254,7 +254,7 @@ innobase_commit_low(
 /*================*/
 	trx_t*	trx);	/* in: transaction handle */
 
-struct show_var_st innodb_status_variables[]= {
+SHOW_VAR innodb_status_variables[]= {
   {"buffer_pool_pages_data",
   (char*) &export_vars.innodb_buffer_pool_pages_data,     SHOW_LONG},
   {"buffer_pool_pages_dirty",

handler/ha_innodb.h

@@ -209,7 +209,7 @@ class ha_innobase: public handler
 					uint table_changes);
 };
 
-extern struct show_var_st innodb_status_variables[];
+extern SHOW_VAR innodb_status_variables[];
 extern ulong innobase_fast_shutdown;
 extern ulong innobase_large_page_size;
 extern long innobase_mirrored_log_groups, innobase_log_files_in_group;