diff options
| author | unknown <patg@patrick.local> | 2005-04-01 12:32:17 -0800 |
|---|---|---|
| committer | unknown <patg@patrick.local> | 2005-04-01 12:32:17 -0800 |
| commit | c0333ecee42a4de499b3377cfa21d7b5af1ddd2b (patch) | |
| tree | 389228d07d324be3e962fefab032b134daa8021a /server-tools/instance-manager/instance_options.cc | |
| parent | 844acf9a66bb85ea0604f385efdaf2c655fd957a (diff) | |
| parent | bd2da82b2131241ce960bb02075aba2689ed1a3a (diff) | |
| download | mariadb-git-c0333ecee42a4de499b3377cfa21d7b5af1ddd2b.tar.gz | |
5.0 to 5.1 merge
mysql-test/r/grant.result:
Auto merged
scripts/mysql_create_system_tables.sh:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/Makefile.am:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
configure.in:
merge of 5.0 to 5.1, version info and NDB_VERSION_() conflicts
libmysqld/Makefile.am:
merge of Makefile sql_sources list
sql/sql_acl.h:
merge, no need to hand resolve
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'server-tools/instance-manager/instance_options.cc')
| -rw-r--r-- | server-tools/instance-manager/instance_options.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/server-tools/instance-manager/instance_options.cc b/server-tools/instance-manager/instance_options.cc index e1b81bc93b1..0d602f88ad2 100644 --- a/server-tools/instance-manager/instance_options.cc +++ b/server-tools/instance-manager/instance_options.cc @@ -19,8 +19,10 @@ #endif #include "instance_options.h" + #include "parse_output.h" #include "buffer.h" + #include <my_sys.h> #include <mysql.h> #include <signal.h> |