simplify future xtradb merges (hopefully)

storage/xtradb/handler/ha_innodb.cc

@@ -13155,29 +13155,29 @@ maria_declare_plugin(xtradb)
   INNODB_VERSION_STR,         /* string version */
   MariaDB_PLUGIN_MATURITY_STABLE /* maturity */
 },
-i_s_innodb_rseg_maria,
-i_s_innodb_undo_logs_maria,
-i_s_innodb_trx_maria,
-i_s_innodb_locks_maria,
-i_s_innodb_lock_waits_maria,
-i_s_innodb_cmp_maria,
-i_s_innodb_cmp_reset_maria,
-i_s_innodb_cmpmem_maria,
-i_s_innodb_cmpmem_reset_maria,
-i_s_innodb_sys_tables_maria,
-i_s_innodb_sys_tablestats_maria,
-i_s_innodb_sys_indexes_maria,
-i_s_innodb_sys_columns_maria,
-i_s_innodb_sys_fields_maria,
-i_s_innodb_sys_foreign_maria,
-i_s_innodb_sys_foreign_cols_maria,
-i_s_innodb_sys_stats_maria,
-i_s_innodb_table_stats_maria,
-i_s_innodb_index_stats_maria,
-i_s_innodb_buffer_pool_pages_maria,
-i_s_innodb_buffer_pool_pages_index_maria,
-i_s_innodb_buffer_pool_pages_blob_maria,
-i_s_innodb_admin_command_maria
+i_s_innodb_rseg,
+i_s_innodb_undo_logs,
+i_s_innodb_trx,
+i_s_innodb_locks,
+i_s_innodb_lock_waits,
+i_s_innodb_cmp,
+i_s_innodb_cmp_reset,
+i_s_innodb_cmpmem,
+i_s_innodb_cmpmem_reset,
+i_s_innodb_sys_tables,
+i_s_innodb_sys_tablestats,
+i_s_innodb_sys_indexes,
+i_s_innodb_sys_columns,
+i_s_innodb_sys_fields,
+i_s_innodb_sys_foreign,
+i_s_innodb_sys_foreign_cols,
+i_s_innodb_sys_stats,
+i_s_innodb_table_stats,
+i_s_innodb_index_stats,
+i_s_innodb_buffer_pool_pages,
+i_s_innodb_buffer_pool_pages_index,
+i_s_innodb_buffer_pool_pages_blob,
+i_s_innodb_admin_command
 maria_declare_plugin_end;
 
 

storage/xtradb/handler/i_s.h

@@ -28,52 +28,28 @@ Created July 18, 2007 Vasil Dimov
 
 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;
-extern struct st_mysql_plugin	i_s_innodb_cmp;
-extern struct st_mysql_plugin	i_s_innodb_cmp_reset;
-extern struct st_mysql_plugin	i_s_innodb_cmpmem;
-extern struct st_mysql_plugin	i_s_innodb_cmpmem_reset;
-extern struct st_mysql_plugin	i_s_innodb_sys_tables;
-extern struct st_mysql_plugin	i_s_innodb_sys_tablestats;
-extern struct st_mysql_plugin	i_s_innodb_sys_indexes;
-extern struct st_mysql_plugin   i_s_innodb_sys_columns;
-extern struct st_mysql_plugin   i_s_innodb_sys_fields;
-extern struct st_mysql_plugin   i_s_innodb_sys_foreign;
-extern struct st_mysql_plugin   i_s_innodb_sys_foreign_cols;
-extern struct st_mysql_plugin	i_s_innodb_rseg;
-extern struct st_mysql_plugin	i_s_innodb_undo_logs;
-extern struct st_mysql_plugin	i_s_innodb_sys_stats;
-extern struct st_mysql_plugin	i_s_innodb_table_stats;
-extern struct st_mysql_plugin	i_s_innodb_index_stats;
-extern struct st_mysql_plugin	i_s_innodb_admin_command;
-extern struct st_mysql_plugin	i_s_innodb_buffer_pool_pages;
-extern struct st_mysql_plugin	i_s_innodb_buffer_pool_pages_index;
-extern struct st_mysql_plugin	i_s_innodb_buffer_pool_pages_blob;
-
-extern struct st_maria_plugin	i_s_innodb_trx_maria;
-extern struct st_maria_plugin	i_s_innodb_locks_maria;
-extern struct st_maria_plugin	i_s_innodb_lock_waits_maria;
-extern struct st_maria_plugin	i_s_innodb_cmp_maria;
-extern struct st_maria_plugin	i_s_innodb_cmp_reset_maria;
-extern struct st_maria_plugin	i_s_innodb_cmpmem_maria;
-extern struct st_maria_plugin	i_s_innodb_cmpmem_reset_maria;
-extern struct st_maria_plugin	i_s_innodb_sys_tables_maria;
-extern struct st_maria_plugin	i_s_innodb_sys_tablestats_maria;
-extern struct st_maria_plugin	i_s_innodb_sys_indexes_maria;
-extern struct st_maria_plugin	i_s_innodb_sys_columns_maria;
-extern struct st_maria_plugin	i_s_innodb_sys_fields_maria;
-extern struct st_maria_plugin	i_s_innodb_sys_foreign_maria;
-extern struct st_maria_plugin	i_s_innodb_sys_foreign_cols_maria;
-extern struct st_maria_plugin	i_s_innodb_sys_stats_maria;
-extern struct st_maria_plugin	i_s_innodb_rseg_maria;
-extern struct st_maria_plugin	i_s_innodb_undo_logs_maria;
-extern struct st_maria_plugin	i_s_innodb_table_stats_maria;
-extern struct st_maria_plugin	i_s_innodb_index_stats_maria;
-extern struct st_maria_plugin	i_s_innodb_admin_command_maria;
-extern struct st_maria_plugin	i_s_innodb_buffer_pool_pages_maria;
-extern struct st_maria_plugin	i_s_innodb_buffer_pool_pages_index_maria;
-extern struct st_maria_plugin	i_s_innodb_buffer_pool_pages_blob_maria;
+extern struct st_maria_plugin	i_s_innodb_trx;
+extern struct st_maria_plugin	i_s_innodb_locks;
+extern struct st_maria_plugin	i_s_innodb_lock_waits;
+extern struct st_maria_plugin	i_s_innodb_cmp;
+extern struct st_maria_plugin	i_s_innodb_cmp_reset;
+extern struct st_maria_plugin	i_s_innodb_cmpmem;
+extern struct st_maria_plugin	i_s_innodb_cmpmem_reset;
+extern struct st_maria_plugin	i_s_innodb_sys_tables;
+extern struct st_maria_plugin	i_s_innodb_sys_tablestats;
+extern struct st_maria_plugin	i_s_innodb_sys_indexes;
+extern struct st_maria_plugin   i_s_innodb_sys_columns;
+extern struct st_maria_plugin   i_s_innodb_sys_fields;
+extern struct st_maria_plugin   i_s_innodb_sys_foreign;
+extern struct st_maria_plugin   i_s_innodb_sys_foreign_cols;
+extern struct st_maria_plugin	i_s_innodb_rseg;
+extern struct st_maria_plugin	i_s_innodb_undo_logs;
+extern struct st_maria_plugin	i_s_innodb_sys_stats;
+extern struct st_maria_plugin	i_s_innodb_table_stats;
+extern struct st_maria_plugin	i_s_innodb_index_stats;
+extern struct st_maria_plugin	i_s_innodb_admin_command;
+extern struct st_maria_plugin	i_s_innodb_buffer_pool_pages;
+extern struct st_maria_plugin	i_s_innodb_buffer_pool_pages_index;
+extern struct st_maria_plugin	i_s_innodb_buffer_pool_pages_blob;
 
 #endif /* i_s_h */