From 55fb3caeecd1a7686789a2f847039cbd7dfb355e Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 17 Aug 2006 22:24:35 +0200 Subject: [PATCH] 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: Removed wrongly placed closing brace sql/item_geofunc.cc: needed to pass in a TABLE_SHARE* instead of a TABLE* --- server-tools/instance-manager/instance.cc | 1 - sql/item_geofunc.cc | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/server-tools/instance-manager/instance.cc b/server-tools/instance-manager/instance.cc index 33a31cfd97e..53f859ef7ae 100644 --- a/server-tools/instance-manager/instance.cc +++ b/server-tools/instance-manager/instance.cc @@ -512,7 +512,6 @@ int Instance::stop() */ waitchild= options.shutdown_delay_val; } - } kill_instance(SIGTERM); /* sleep on condition to wait for SIGCHLD */ diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc index c5200e26cb7..ee4df8f1cfc 100644 --- a/sql/item_geofunc.cc +++ b/sql/item_geofunc.cc @@ -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()); }