hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #23 from hholzgra/hartmut-DEL

Browse Source 
Hartmut del
This commit is contained in:
Vilho Raatikka
2014-08-18 09:20:03 +03:00
parent 85ebc6d543 fb87f68368
commit 087c4720bb
11 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README
View File

@ -182,7 +182,7 @@ on localhost:
* a master on port 3000, with server_id=2 * a master on port 3000, with server_id=2
* a slave on port 3001, server_id doesn't matter * a slave on port 3001, server_id doesn't matter
* a slave on port 2002, server_id doesn't matter * a slave on port 3002, server_id doesn't matter
On the master full privileges on the databases "test" and "FOO" On the master full privileges on the databases "test" and "FOO"
are needed, on the saves SELECT permissions on test.* should are needed, on the saves SELECT permissions on test.* should

9
client/Makefile
View File

@ -20,6 +20,9 @@
# client program # client program
# 18/06/14 Mark Riddoch Addition of conditional for histedit # 18/06/14 Mark Riddoch Addition of conditional for histedit
include ../build_gateway.inc
include ../makefile.inc
ifeq ($(wildcard /usr/include/histedit.h), ) ifeq ($(wildcard /usr/include/histedit.h), )
HISTLIB= HISTLIB=
HISTFLAG= HISTFLAG=
@ -63,14 +66,14 @@ maxadmin: $(OBJ)
clean: clean:
rm -f $(OBJ) maxadmin $(DEL) $(OBJ) maxadmin
- rm *.so $(DEL) *.so
tags: tags:
ctags $(SRCS) $(HDRS) ctags $(SRCS) $(HDRS)
depend: depend:
@rm -f depend.mk @$(DEL) depend.mk
cc -M $(CFLAGS) $(SRCS) > depend.mk cc -M $(CFLAGS) $(SRCS) > depend.mk
install: maxadmin install: maxadmin

2
log_manager/makefile
View File

@ -44,7 +44,7 @@ install: liblink
install liblog_manager.so.1.0.1 liblog_manager.so $(DEST)/lib install liblog_manager.so.1.0.1 liblog_manager.so $(DEST)/lib
depend: depend:
@rm -f depend @$(DEL) depend
$(CPP) -M $(CFLAGS) \ $(CPP) -M $(CFLAGS) \
$(MYSQL_HEADERS) \ $(MYSQL_HEADERS) \
-I$(UTILS_PATH) -I./ \ -I$(UTILS_PATH) -I./ \

2
query_classifier/makefile
View File

@ -62,7 +62,7 @@ install: liblink
install ./libquery_classifier.so.1.0.1 ./libquery_classifier.so $(DEST)/lib install ./libquery_classifier.so.1.0.1 ./libquery_classifier.so $(DEST)/lib
depend: depend:
@rm -f depend @$(DEL) depend
$(CPP) -M $(CFLAGS) \ $(CPP) -M $(CFLAGS) \
$(MYSQL_HEADERS) \ $(MYSQL_HEADERS) \
-I$(LOG_MANAGER_PATH) \ -I$(LOG_MANAGER_PATH) \

5
server/Makefile
View File

@ -24,6 +24,9 @@
# 08/07/13 Mark Riddoch Addition of monitor modules # 08/07/13 Mark Riddoch Addition of monitor modules
# 16/07/13 Mark Riddoch Renamed things to match the new naming # 16/07/13 Mark Riddoch Renamed things to match the new naming
include ../build_gateway.inc
include ../makefile.inc
DEST=$(HOME)/usr/local/skysql DEST=$(HOME)/usr/local/skysql
all: all:
@ -45,7 +48,7 @@ testall:
$(MAKE) -C test HAVE_SRV=$(HAVE_SRV) testall $(MAKE) -C test HAVE_SRV=$(HAVE_SRV) testall
clean: clean:
(cd Documentation; rm -rf html) (cd Documentation; $(DEL) html)
(cd core; touch depend.mk ; make clean) (cd core; touch depend.mk ; make clean)
(cd modules/routing; touch depend.mk ; make clean) (cd modules/routing; touch depend.mk ; make clean)
(cd modules/protocol; touch depend.mk ; make clean) (cd modules/protocol; touch depend.mk ; make clean)

6
server/core/Makefile
View File

@ -108,14 +108,14 @@ maxpasswd: $(POBJS)
echo '#define MAXSCALE_VERSION "'`cat ../../VERSION`'"' > ../include/version.h echo '#define MAXSCALE_VERSION "'`cat ../../VERSION`'"' > ../include/version.h
clean: clean:
rm -f $(OBJ) maxscale $(DEL) $(OBJ) maxscale
- rm *.so $(DEL) *.so
tags: tags:
ctags $(SRCS) $(HDRS) ctags $(SRCS) $(HDRS)
depend: ../include/version.h depend: ../include/version.h
@rm -f depend.mk @$(DEL) depend.mk
cc -M $(CFLAGS) $(SRCS) > depend.mk cc -M $(CFLAGS) $(SRCS) > depend.mk
install: maxscale maxkeys maxpasswd install: maxscale maxkeys maxpasswd

4
server/modules/filter/Makefile
View File

@ -69,13 +69,13 @@ libtee.so: $(TEEOBJ)
$(CC) $(CFLAGS) $< -o $@ $(CC) $(CFLAGS) $< -o $@
clean: clean:
rm -f $(OBJ) $(MODULES) $(DEL) $(OBJ) $(MODULES)
tags: tags:
ctags $(SRCS) $(HDRS) ctags $(SRCS) $(HDRS)
depend: depend:
@rm -f depend.mk @$(DEL) depend.mk
cc -M $(CFLAGS) $(SRCS) > depend.mk cc -M $(CFLAGS) $(SRCS) > depend.mk
install: $(MODULES) install: $(MODULES)

6
server/modules/monitor/Makefile
View File

@ -19,6 +19,8 @@
# 08/07/13 Mark Riddoch Initial implementation # 08/07/13 Mark Riddoch Initial implementation
include ../../../build_gateway.inc include ../../../build_gateway.inc
include ../../../makefile.inc
LOGPATH := $(ROOT_PATH)/log_manager LOGPATH := $(ROOT_PATH)/log_manager
UTILSPATH := $(ROOT_PATH)/utils UTILSPATH := $(ROOT_PATH)/utils
@ -55,13 +57,13 @@ libgaleramon.so: $(GALERAOBJ)
$(CC) $(CFLAGS) $< -o $@ $(CC) $(CFLAGS) $< -o $@
clean: clean:
rm -f $(OBJ) $(MODULES) $(DEL) $(OBJ) $(MODULES)
tags: tags:
ctags $(SRCS) $(HDRS) ctags $(SRCS) $(HDRS)
depend: depend:
@rm -f depend.mk @$(DEL) depend.mk
cc -M $(CFLAGS) $(SRCS) > depend.mk cc -M $(CFLAGS) $(SRCS) > depend.mk
install: $(MODULES) install: $(MODULES)

4
server/modules/protocol/Makefile
View File

@ -76,7 +76,7 @@ libmaxscaled.so: $(MAXSCALEDOBJ)
$(CC) $(CFLAGS) $< -o $@ $(CC) $(CFLAGS) $< -o $@
clean: clean:
rm -f $(OBJ) $(MODULES) $(DEL) $(OBJ) $(MODULES)
tags: tags:
ctags $(SRCS) $(HDRS) ctags $(SRCS) $(HDRS)
@ -85,7 +85,7 @@ install: $(MODULES)
install -D $(MODULES) $(DEST)/modules install -D $(MODULES) $(DEST)/modules
depend: depend:
rm -f depend.mk @$(DEL) depend.mk
cc -M $(CFLAGS) $(SRCS) > depend.mk cc -M $(CFLAGS) $(SRCS) > depend.mk
include depend.mk include depend.mk

4
server/modules/routing/Makefile
View File

@ -71,7 +71,7 @@ libreadwritesplit.so:
$(CC) $(CFLAGS) $< -o $@ $(CC) $(CFLAGS) $< -o $@
clean: clean:
rm -f $(OBJ) $(MODULES) $(DEL) $(OBJ) $(MODULES)
(cd readwritesplit; touch depend.mk; make clean) (cd readwritesplit; touch depend.mk; make clean)
tags: tags:
@ -79,7 +79,7 @@ tags:
(cd readwritesplit; make tags) (cd readwritesplit; make tags)
depend: depend:
@rm -f depend.mk @$(DEL) depend.mk
cc -M $(CFLAGS) $(SRCS) > depend.mk cc -M $(CFLAGS) $(SRCS) > depend.mk
(cd readwritesplit; touch depend.mk ; make depend) (cd readwritesplit; touch depend.mk ; make depend)

4
server/modules/routing/readwritesplit/Makefile
View File

@ -50,13 +50,13 @@ libreadwritesplit.so: $(OBJ)
$(CC) $(CFLAGS) $< -o $@ $(CC) $(CFLAGS) $< -o $@
clean: clean:
rm -f $(OBJ) $(MODULES) $(DEL) $(OBJ) $(MODULES)
tags: tags:
ctags $(SRCS) $(HDRS) ctags $(SRCS) $(HDRS)
depend: depend:
@rm -f depend.mk @$(DEL) depend.mk
cc -M $(CFLAGS) $(SRCS) > depend.mk cc -M $(CFLAGS) $(SRCS) > depend.mk
install: $(MODULES) install: $(MODULES)