diff options
| author | unknown <anozdrin@mysql.com> | 2006-05-22 14:22:58 +0400 |
|---|---|---|
| committer | unknown <anozdrin@mysql.com> | 2006-05-22 14:22:58 +0400 |
| commit | 089595c55fd01821985864c74cd4dc9945938ece (patch) | |
| tree | d756402e41acccf5656b880df10ab31c4e9a8ca5 /server-tools/instance-manager/manager.h | |
| parent | 57b60b14ab6f7222e380303feecbd3616b1a4389 (diff) | |
| parent | 0276916b155e8230e17285dec3cd78206e180c80 (diff) | |
| download | mariadb-git-089595c55fd01821985864c74cd4dc9945938ece.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/mnt/raid/MySQL/devel/5.1-rt-wl3158-merged
BitKeeper/deleted/.del-im_options_set.result~59278f56be61d921:
Auto merged
include/my_sys.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
BitKeeper/deleted/.del-im_options_unset.result~20a4790cd3c70a4f:
Auto merged
mysql-test/r/im_daemon_life_cycle.result:
Auto merged
mysql-test/r/im_life_cycle.result:
Auto merged
server-tools/instance-manager/Makefile.am:
Auto merged
server-tools/instance-manager/mysqlmanager.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/structs.h:
Auto merged
mysql-test/r/im_utils.result:
Auto merged
server-tools/instance-manager/instance_options.cc:
Manually merged.
server-tools/instance-manager/instance_options.h:
Manually merged.
server-tools/instance-manager/manager.cc:
Manually merged.
server-tools/instance-manager/manager.h:
Manually merged.
server-tools/instance-manager/options.cc:
Manually merged.
server-tools/instance-manager/options.h:
Manually merged.
Diffstat (limited to 'server-tools/instance-manager/manager.h')
| -rw-r--r-- | server-tools/instance-manager/manager.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/server-tools/instance-manager/manager.h b/server-tools/instance-manager/manager.h index 3ddf292132e..7aa4b3e1a96 100644 --- a/server-tools/instance-manager/manager.h +++ b/server-tools/instance-manager/manager.h @@ -16,9 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -struct Options; - -void manager(const Options &options); +void manager(); int create_pid_file(const char *pid_file_name, int pid); |