diff options
| author | unknown <msvensson@pilot.mysql.com> | 2007-02-06 15:50:24 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.mysql.com> | 2007-02-06 15:50:24 +0100 |
| commit | a2a6839e07c36d60b42f0d5e0b7097c60f1c2ab4 (patch) | |
| tree | 98887a74b2502a1c8d29b74ec9582d57c5314a40 /server-tools | |
| parent | 7bba59bb2565349237f58932d010cc143bf9ac06 (diff) | |
| parent | 2470806f9a39e3d2709fb51731e0625140a97f5a (diff) | |
| download | mariadb-git-a2a6839e07c36d60b42f0d5e0b7097c60f1c2ab4.tar.gz | |
Merge 192.168.0.10:mysql/mysql-5.1-maint
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
BitKeeper/etc/collapsed:
auto-union
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/range.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/select.test:
Auto merged
scripts/mysqld_multi.sh:
Auto merged
sql/field.h:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'server-tools')
| -rw-r--r-- | server-tools/instance-manager/instance.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server-tools/instance-manager/instance.cc b/server-tools/instance-manager/instance.cc index 2c94689c664..31e060e27fe 100644 --- a/server-tools/instance-manager/instance.cc +++ b/server-tools/instance-manager/instance.cc @@ -17,7 +17,7 @@ #pragma implementation #endif - +#include <my_global.h> #include <mysql.h> #include <signal.h> |