Commit 6de02fcd authored by unknown's avatar unknown
Browse files

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

parent 243fddd9

sql/ha_ndbcluster.cc

+0 −4
Original line number Diff line number Diff line
@@ -7132,10 +7132,6 @@ void ndbcluster_real_free_share(NDB_SHARE **share) 
#ifndef DBUG_OFF

    bzero((gptr)(*share)->table_share, sizeof(*(*share)->table_share));

    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= 0;

#endif

sql/ha_ndbcluster_binlog.cc

+2 −7
Original line number Diff line number Diff line
@@ -278,8 +278,6 @@ ndbcluster_binlog_open_table(THD *thd, NDB_SHARE *share, 
                    share->key, error);

    DBUG_PRINT("error", ("open_table_def failed %d", error));

    free_table_share(table_share);

    my_free((gptr) table_share, MYF(0));

    my_free((gptr) table, MYF(0));

    DBUG_RETURN(error);

  }

  if ((error= open_table_from_share(thd, table_share, "", 0,
@@ -289,8 +287,6 @@ ndbcluster_binlog_open_table(THD *thd, NDB_SHARE *share, 
                    share->key, error, my_errno);

    DBUG_PRINT("error", ("open_table_from_share failed %d", error));

    free_table_share(table_share);

    my_free((gptr) table_share, MYF(0));

    my_free((gptr) table, MYF(0));

    DBUG_RETURN(error);

  }

  assign_new_table_id(table_share);
@@ -366,9 +362,8 @@ void ndbcluster_binlog_init_share(NDB_SHARE *share, TABLE *_table) 
  while (1) 

  {

    int error;

    TABLE_SHARE *table_share= 

      (TABLE_SHARE *) my_malloc(sizeof(*table_share), MYF(MY_WME));

    TABLE *table= (TABLE*) my_malloc(sizeof(*table), MYF(MY_WME));

    TABLE_SHARE *table_share= (TABLE_SHARE *) alloc_root(mem_root, sizeof(*table_share));

    TABLE *table= (TABLE*) alloc_root(mem_root, sizeof(*table));

    if ((error= ndbcluster_binlog_open_table(thd, share, table_share, table)))

      break;

    /*