ndb: changed to use mem root to allocate table structure for ndb share

parent 9cba147a
...@@ -7132,10 +7132,6 @@ void ndbcluster_real_free_share(NDB_SHARE **share) ...@@ -7132,10 +7132,6 @@ void ndbcluster_real_free_share(NDB_SHARE **share)
#ifndef DBUG_OFF #ifndef DBUG_OFF
bzero((gptr)(*share)->table_share, sizeof(*(*share)->table_share)); bzero((gptr)(*share)->table_share, sizeof(*(*share)->table_share));
bzero((gptr)(*share)->table, sizeof(*(*share)->table)); bzero((gptr)(*share)->table, sizeof(*(*share)->table));
#endif
my_free((gptr) (*share)->table_share, MYF(0));
my_free((gptr) (*share)->table, MYF(0));
#ifndef DBUG_OFF
(*share)->table_share= 0; (*share)->table_share= 0;
(*share)->table= 0; (*share)->table= 0;
#endif #endif
......
...@@ -278,8 +278,6 @@ ndbcluster_binlog_open_table(THD *thd, NDB_SHARE *share, ...@@ -278,8 +278,6 @@ ndbcluster_binlog_open_table(THD *thd, NDB_SHARE *share,
share->key, error); share->key, error);
DBUG_PRINT("error", ("open_table_def failed %d", error)); DBUG_PRINT("error", ("open_table_def failed %d", error));
free_table_share(table_share); free_table_share(table_share);
my_free((gptr) table_share, MYF(0));
my_free((gptr) table, MYF(0));
DBUG_RETURN(error); DBUG_RETURN(error);
} }
if ((error= open_table_from_share(thd, table_share, "", 0, if ((error= open_table_from_share(thd, table_share, "", 0,
...@@ -289,8 +287,6 @@ ndbcluster_binlog_open_table(THD *thd, NDB_SHARE *share, ...@@ -289,8 +287,6 @@ ndbcluster_binlog_open_table(THD *thd, NDB_SHARE *share,
share->key, error, my_errno); share->key, error, my_errno);
DBUG_PRINT("error", ("open_table_from_share failed %d", error)); DBUG_PRINT("error", ("open_table_from_share failed %d", error));
free_table_share(table_share); free_table_share(table_share);
my_free((gptr) table_share, MYF(0));
my_free((gptr) table, MYF(0));
DBUG_RETURN(error); DBUG_RETURN(error);
} }
assign_new_table_id(table_share); assign_new_table_id(table_share);
...@@ -366,9 +362,8 @@ void ndbcluster_binlog_init_share(NDB_SHARE *share, TABLE *_table) ...@@ -366,9 +362,8 @@ void ndbcluster_binlog_init_share(NDB_SHARE *share, TABLE *_table)
while (1) while (1)
{ {
int error; int error;
TABLE_SHARE *table_share= TABLE_SHARE *table_share= (TABLE_SHARE *) alloc_root(mem_root, sizeof(*table_share));
(TABLE_SHARE *) my_malloc(sizeof(*table_share), MYF(MY_WME)); TABLE *table= (TABLE*) alloc_root(mem_root, sizeof(*table));
TABLE *table= (TABLE*) my_malloc(sizeof(*table), MYF(MY_WME));
if ((error= ndbcluster_binlog_open_table(thd, share, table_share, table))) if ((error= ndbcluster_binlog_open_table(thd, share, table_share, table)))
break; break;
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment