mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 12:01:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
This commit is contained in:
cmiller@zippy.cornsilk.net 2006-08-18 07:09:21 -04:00
commit 9e5db9f6ea
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
server-tools/instance-manager/instance.cc
View file

@ -512,7 +512,6 @@ int Instance::stop()
*/ */
waitchild= options.shutdown_delay_val; waitchild= options.shutdown_delay_val;
} }
}
kill_instance(SIGTERM); kill_instance(SIGTERM);
/* sleep on condition to wait for SIGCHLD */ /* sleep on condition to wait for SIGCHLD */

2
sql/item_geofunc.cc
View file

@ -27,7 +27,7 @@
Field *Item_geometry_func::tmp_table_field(TABLE *t_arg) 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()); (Field::geometry_type) get_geometry_type());
} }