diff options
| author | unknown <rburnett@production.mysql.com> | 2006-08-17 22:24:35 +0200 |
|---|---|---|
| committer | unknown <rburnett@production.mysql.com> | 2006-08-17 22:24:35 +0200 |
| commit | 55fb3caeecd1a7686789a2f847039cbd7dfb355e (patch) | |
| tree | 3affab0b3d0914115f42baced334271a24d75e37 /server-tools/instance-manager | |
| parent | 703717c705594592be0bce8b160aeec0ec1d51ba (diff) | |
| download | mariadb-git-55fb3caeecd1a7686789a2f847039cbd7dfb355e.tar.gz | |
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*
Diffstat (limited to 'server-tools/instance-manager')
| -rw-r--r-- | server-tools/instance-manager/instance.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/server-tools/instance-manager/instance.cc b/server-tools/instance-manager/instance.cc index 33a31cfd97e..53f859ef7ae 100644 --- 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 */ |