Merge bk-internal.mysql.com:/data0/bk/mysql-5.1

into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt

Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
d094b5f2 · rburnett@bk-internal.mysql.com · 4b7e3775 · 284fa931 · d094b5f2 · d094b5f2
Commit d094b5f2 authored Aug 18, 2006 by rburnett@bk-internal.mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

server-tools/instance-manager/instance.cc server-tools/instance-manager/instance.cc +0 -1

sql/item_geofunc.cc sql/item_geofunc.cc +1 -1

No files found.
--- 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 */

--- 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());
 }