summaryrefslogtreecommitdiff
path: root/server-tools/instance-manager/instance.h
diff options
context:
space:
mode:
authorunknown <joerg@trift2.>2007-01-02 19:17:19 +0100
committerunknown <joerg@trift2.>2007-01-02 19:17:19 +0100
commit9da73670f7905c0959c4c6349a46da61444b852e (patch)
tree113deebb91102d579975d9624cdb607323a6c489 /server-tools/instance-manager/instance.h
parentc16b3782edd0337d45bbe503f0ed874df028a715 (diff)
parent3431b8cf668842c3db62dbaf5bcf97fab653ba54 (diff)
downloadmariadb-git-9da73670f7905c0959c4c6349a46da61444b852e.tar.gz
Merge trift2.:/MySQL/M51/clone-5.1
into trift2.:/MySQL/M51/push-5.1 mysql-test/mysql-test-run.pl: Auto merged mysql-test/t/rpl_000015.test: Auto merged server-tools/instance-manager/Makefile.am: Auto merged server-tools/instance-manager/guardian.cc: Auto merged sql/log_event.cc: Auto merged
Diffstat (limited to 'server-tools/instance-manager/instance.h')
0 files changed, 0 insertions, 0 deletions