bk commit into 5.1 tree (rburnett:1.2284)

[reggie]

Below is the list of changes that have just been committed into a local
5.1 repository of rburnett. When rburnett 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@stripped, 2006-08-17 22:24:35+02:00, rburnett@stripped +2 -0
  A couple of adjustments to the merge to fix the broken build
  
  instance.cc:
    Removed wrongly placed closing brace
  item_geofunc.cc:
    needed to pass in a TABLE_SHARE* instead of a TABLE*

  server-tools/instance-manager/instance.cc@stripped, 2006-08-17 22:23:34+02:00,
rburnett@stripped +0 -1
    Removed wrongly placed closing brace

  sql/item_geofunc.cc@stripped, 2006-08-17 22:24:03+02:00, rburnett@stripped +1 -1
    needed to pass in a TABLE_SHARE* instead of a TABLE*

# 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:	rburnett
# Host:	production.mysql.com
# Root:	/usersnfs/rburnett/mysql-5.1

--- 1.35/server-tools/instance-manager/instance.cc	2006-08-17 22:24:43 +02:00
+++ 1.36/server-tools/instance-manager/instance.cc	2006-08-17 22:24:43 +02:00
@@ -512,7 +512,6 @@
       */
       waitchild= options.shutdown_delay_val;
     }
-  }
 
     kill_instance(SIGTERM);
     /* sleep on condition to wait for SIGCHLD */

--- 1.27/sql/item_geofunc.cc	2006-08-17 22:24:43 +02:00
+++ 1.28/sql/item_geofunc.cc	2006-08-17 22:24:43 +02:00
@@ -27,7 +27,7 @@
 
 Field *Item_geometry_func::tmp_table_field(TABLE *t_arg)
 {
-  return new Field_geom(max_length, maybe_null, name, t_arg,
+  return new Field_geom(max_length, maybe_null, name, t_arg->s,
                         (Field::geometry_type) get_geometry_type());
 }