mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
This changest:
Plugins now when compiled or not compiled work correctly with status variables. Status variables from plugins now set their own names (removed bit where plugin name was pre-appended this broke Innodb and Cluster) A few Makefile cleanups. sql/ha_innodb.cc: Cleanup to make status variables directly in engine sql/ha_ndbcluster.cc: Engine interface now has variables for status sql/handler.cc: handler now makes sure to init status variables sql/mysqld.cc: Removed status variable hacks sql/sql_delete.cc: Removed include file that was not required storage/myisam/Makefile.am: Cleaned up line lengths and addded additional include to not install. storage/myisam/ha_myisam.cc: Removed double plugin include
This commit is contained in:
@@ -37,10 +37,6 @@
|
||||
#include "ha_partition.h"
|
||||
#endif
|
||||
|
||||
#ifdef WITH_INNOBASE_STORAGE_ENGINE
|
||||
#include "ha_innodb.h"
|
||||
#endif
|
||||
|
||||
/*
|
||||
While we have legacy_db_type, we have this array to
|
||||
check for dups and to find handlerton from legacy_db_type.
|
||||
@@ -434,6 +430,12 @@ int ha_initialize_handlerton(st_plugin_int *plugin)
|
||||
savepoint_alloc_size+= tmp;
|
||||
hton->slot= total_ha++;
|
||||
hton2plugin[hton->slot]=plugin;
|
||||
/* This is just a temp need until plugin/engine startup is fixed */
|
||||
if (plugin->plugin->status_vars)
|
||||
{
|
||||
add_status_vars(plugin->plugin->status_vars);
|
||||
}
|
||||
|
||||
if (hton->prepare)
|
||||
total_ha_2pc++;
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user