mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
fix plugin.test - bad merge in TABLE_SHARE::destroy, ha_share must be deleted before the plugin
This commit is contained in:
@ -15,7 +15,7 @@ PLUGIN_STATUS ACTIVE
|
|||||||
PLUGIN_TYPE STORAGE ENGINE
|
PLUGIN_TYPE STORAGE ENGINE
|
||||||
PLUGIN_TYPE_VERSION #
|
PLUGIN_TYPE_VERSION #
|
||||||
PLUGIN_LIBRARY ha_example.so
|
PLUGIN_LIBRARY ha_example.so
|
||||||
PLUGIN_LIBRARY_VERSION 1.4
|
PLUGIN_LIBRARY_VERSION 1.5
|
||||||
PLUGIN_AUTHOR Brian Aker, MySQL AB
|
PLUGIN_AUTHOR Brian Aker, MySQL AB
|
||||||
PLUGIN_DESCRIPTION Example storage engine
|
PLUGIN_DESCRIPTION Example storage engine
|
||||||
PLUGIN_LICENSE GPL
|
PLUGIN_LICENSE GPL
|
||||||
@ -28,7 +28,7 @@ PLUGIN_STATUS ACTIVE
|
|||||||
PLUGIN_TYPE DAEMON
|
PLUGIN_TYPE DAEMON
|
||||||
PLUGIN_TYPE_VERSION #
|
PLUGIN_TYPE_VERSION #
|
||||||
PLUGIN_LIBRARY ha_example.so
|
PLUGIN_LIBRARY ha_example.so
|
||||||
PLUGIN_LIBRARY_VERSION 1.4
|
PLUGIN_LIBRARY_VERSION 1.5
|
||||||
PLUGIN_AUTHOR Sergei Golubchik
|
PLUGIN_AUTHOR Sergei Golubchik
|
||||||
PLUGIN_DESCRIPTION Unusable Daemon
|
PLUGIN_DESCRIPTION Unusable Daemon
|
||||||
PLUGIN_LICENSE GPL
|
PLUGIN_LICENSE GPL
|
||||||
@ -57,7 +57,7 @@ PLUGIN_STATUS DELETED
|
|||||||
PLUGIN_TYPE STORAGE ENGINE
|
PLUGIN_TYPE STORAGE ENGINE
|
||||||
PLUGIN_TYPE_VERSION #
|
PLUGIN_TYPE_VERSION #
|
||||||
PLUGIN_LIBRARY ha_example.so
|
PLUGIN_LIBRARY ha_example.so
|
||||||
PLUGIN_LIBRARY_VERSION 1.4
|
PLUGIN_LIBRARY_VERSION 1.5
|
||||||
PLUGIN_AUTHOR Brian Aker, MySQL AB
|
PLUGIN_AUTHOR Brian Aker, MySQL AB
|
||||||
PLUGIN_DESCRIPTION Example storage engine
|
PLUGIN_DESCRIPTION Example storage engine
|
||||||
PLUGIN_LICENSE GPL
|
PLUGIN_LICENSE GPL
|
||||||
|
12
sql/table.cc
12
sql/table.cc
@ -429,6 +429,12 @@ void TABLE_SHARE::destroy()
|
|||||||
DBUG_ENTER("TABLE_SHARE::destroy");
|
DBUG_ENTER("TABLE_SHARE::destroy");
|
||||||
DBUG_PRINT("info", ("db: %s table: %s", db.str, table_name.str));
|
DBUG_PRINT("info", ("db: %s table: %s", db.str, table_name.str));
|
||||||
|
|
||||||
|
if (ha_share)
|
||||||
|
{
|
||||||
|
delete ha_share;
|
||||||
|
ha_share= NULL; // Safety
|
||||||
|
}
|
||||||
|
|
||||||
free_root(&stats_cb.mem_root, MYF(0));
|
free_root(&stats_cb.mem_root, MYF(0));
|
||||||
stats_cb.stats_can_be_read= FALSE;
|
stats_cb.stats_can_be_read= FALSE;
|
||||||
stats_cb.stats_is_read= FALSE;
|
stats_cb.stats_is_read= FALSE;
|
||||||
@ -451,12 +457,6 @@ void TABLE_SHARE::destroy()
|
|||||||
info_it->flags= 0;
|
info_it->flags= 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (ha_share)
|
|
||||||
{
|
|
||||||
delete ha_share;
|
|
||||||
ha_share= NULL; // Safety
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef HAVE_PSI_TABLE_INTERFACE
|
#ifdef HAVE_PSI_TABLE_INTERFACE
|
||||||
PSI_TABLE_CALL(release_table_share)(m_psi);
|
PSI_TABLE_CALL(release_table_share)(m_psi);
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user