diff options
| author | unknown <kent@mysql.com/kent-amd64.(none)> | 2006-12-31 01:04:07 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com/kent-amd64.(none)> | 2006-12-31 01:04:07 +0100 |
| commit | 27ecbeecdc0a064d0ff5ea88abe01e786fcc5b99 (patch) | |
| tree | ccace61b3d37f7480a06ecda03b0cfc451f58474 /server-tools/instance-manager/options.h | |
| parent | cc5abe68ebb398434db7896defacf858d2ccbe3c (diff) | |
| parent | e2765a84b174af95f1b507c7e30e136301de5bd3 (diff) | |
| download | mariadb-git-27ecbeecdc0a064d0ff5ea88abe01e786fcc5b99.tar.gz | |
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/kent/bk/main/mysql-5.0
myisam/mi_check.c:
Auto merged
myisam/mi_dynrec.c:
Auto merged
myisam/mi_packrec.c:
Auto merged
myisam/mi_range.c:
Auto merged
myisam/mi_test1.c:
Auto merged
myisam/mi_write.c:
Auto merged
myisam/rt_split.c:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
Diffstat (limited to 'server-tools/instance-manager/options.h')
| -rw-r--r-- | server-tools/instance-manager/options.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/server-tools/instance-manager/options.h b/server-tools/instance-manager/options.h index 8a581064e33..152f0f1643f 100644 --- a/server-tools/instance-manager/options.h +++ b/server-tools/instance-manager/options.h @@ -1,6 +1,4 @@ -#ifndef INCLUDES_MYSQL_INSTANCE_MANAGER_OPTIONS_H -#define INCLUDES_MYSQL_INSTANCE_MANAGER_OPTIONS_H -/* Copyright (C) 2003 MySQL AB & MySQL Finland AB & TCX DataKonsult AB +/* Copyright (C) 2003-2006 MySQL AB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,6 +13,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#ifndef INCLUDES_MYSQL_INSTANCE_MANAGER_OPTIONS_H +#define INCLUDES_MYSQL_INSTANCE_MANAGER_OPTIONS_H + /* Options - all possible options for the instance manager grouped in one struct. |