database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

A couple of adjustments to the merge to fix the broken build

Browse Source 
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*
This commit is contained in:
unknown
2006-08-17 22:24:35 +02:00
parent 703717c705
commit 55fb3caeec
2 changed files with 1 additions and 2 deletions
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());
} }