bk commit into 5.1 tree (tomas:1.2157)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2157 06/05/19 15:44:46 tomas@stripped +2 -0
  ndb: changed to use mem root to allocate table structure for ndb share

  sql/ha_ndbcluster_binlog.cc
    1.57 06/05/19 15:44:37 tomas@stripped +2 -7
    ndb: changed to use mem root to allocate table structure for ndb share

  sql/ha_ndbcluster.cc
    1.307 06/05/19 15:44:36 tomas@stripped +0 -4
    ndb: changed to use mem root to allocate table structure for ndb share

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-new-ndb

--- 1.306/sql/ha_ndbcluster.cc	2006-05-19 12:54:04 +02:00
+++ 1.307/sql/ha_ndbcluster.cc	2006-05-19 15:44:36 +02:00
@@ -7132,10 +7132,6 @@
 #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

--- 1.56/sql/ha_ndbcluster_binlog.cc	2006-05-19 12:54:04 +02:00
+++ 1.57/sql/ha_ndbcluster_binlog.cc	2006-05-19 15:44:37 +02:00
@@ -278,8 +278,6 @@
                     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 @@
                     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 @@
   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;
     /*