Commit 9da73670 authored by unknown's avatar unknown
Browse files

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
parents c16b3782 3431b8cf

server-tools/instance-manager/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ client_settings.h: 


libexec_PROGRAMS= mysqlmanager



mysqlmanager_CXXFLAGS=  -Wall -W

mysqlmanager_CXXFLAGS=  



mysqlmanager_SOURCES=	command.cc command.h mysqlmanager.cc \

			manager.h manager.cc log.h log.cc \