summaryrefslogtreecommitdiff
path: root/sql/ha_ndbcluster.h
diff options
context:
space:
mode:
authorunknown <tomas@poseidon.ndb.mysql.com>2008-02-04 15:40:04 +0100
committerunknown <tomas@poseidon.ndb.mysql.com>2008-02-04 15:40:04 +0100
commit0fe17ab3c0a941124cce1ccc2bcd16c3d93425aa (patch)
tree685cab89cfbd1464962488743c3c68ed5734a6f4 /sql/ha_ndbcluster.h
parent0d2be94e60a0778fe559effe84a5ad34b4065704 (diff)
downloadmariadb-git-0fe17ab3c0a941124cce1ccc2bcd16c3d93425aa.tar.gz
Bug #34275 mysqld leak if doing multiple statements within same transaction (or wo/ trans)
- in autocommit do not allocate statistics share, but instead use one directly on the handler
Diffstat (limited to 'sql/ha_ndbcluster.h')
-rw-r--r--sql/ha_ndbcluster.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h
index cc79402fe92..a17323d3fd6 100644
--- a/sql/ha_ndbcluster.h
+++ b/sql/ha_ndbcluster.h
@@ -195,11 +195,6 @@ struct Ndb_local_table_statistics {
ha_rows records;
};
-typedef struct st_thd_ndb_share {
- const void *key;
- struct Ndb_local_table_statistics stat;
-} THD_NDB_SHARE;
-
class Thd_ndb
{
public:
@@ -207,7 +202,6 @@ class Thd_ndb
~Thd_ndb();
void init_open_tables();
- THD_NDB_SHARE *get_open_table(THD *thd, const void *key);
Ndb *ndb;
ulong count;
@@ -514,6 +508,7 @@ private:
NdbScanOperation *m_active_cursor;
const NdbDictionary::Table *m_table;
struct Ndb_local_table_statistics *m_table_info;
+ struct Ndb_local_table_statistics m_table_info_instance;
char m_dbname[FN_HEADLEN];
//char m_schemaname[FN_HEADLEN];
char m_tabname[FN_HEADLEN];
@@ -522,7 +517,6 @@ private:
bool m_lock_tuple;
NDB_SHARE *m_share;
NDB_INDEX_DATA m_index[MAX_KEY];
- THD_NDB_SHARE *m_thd_ndb_share;
// NdbRecAttr has no reference to blob
NdbValue m_value[NDB_MAX_ATTRIBUTES_IN_TABLE];
uchar m_ref[NDB_HIDDEN_PRIMARY_KEY_LENGTH];