mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
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*
This commit is contained in:
@ -512,7 +512,6 @@ int Instance::stop()
|
||||
*/
|
||||
waitchild= options.shutdown_delay_val;
|
||||
}
|
||||
}
|
||||
|
||||
kill_instance(SIGTERM);
|
||||
/* sleep on condition to wait for SIGCHLD */
|
||||
|
Reference in New Issue
Block a user