Commit 05d061d3 authored by unknown's avatar unknown
Browse files

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1 

into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
parents 9954f424 c35d9181

server-tools/instance-manager/instance.cc

+0 −1
Original line number Diff line number Diff line
@@ -512,7 +512,6 @@ int Instance::stop() 
      */

      waitchild= options.shutdown_delay_val;

    }

  }



    kill_instance(SIGTERM);

    /* sleep on condition to wait for SIGCHLD */

sql/item_geofunc.cc

+1 −1
Original line number Diff line number Diff line
@@ -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());

}