From d77b9f4de3221852c65d26e1db62d7aa8c5a0166 Mon Sep 17 00:00:00 2001
From: VilhoRaatikka <vilho.raatikka@skysql.com>
Date: Tue, 9 Sep 2014 09:36:24 +0300
Subject: [PATCH] server/core/test/makefile and server/modules/filter/Makefile:
 Added path to libmysqld (-L<path>) so that linker finds it at compile time.
 server/test/MaxScale_template.cnf: added write_ses_variables_to_all=Yes and
 read_ses_variables_from_slaves=Yes so that tests included in testall target
 succeed (at server/modules/routing/readwritesplit/test). Added hint filter to
 'normal' rwsplit service.

---
 server/core/test/makefile      | 2 +-
 server/modules/filter/Makefile | 4 ++--
 server/test/MaxScale_test.cnf  | 6 +++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/server/core/test/makefile b/server/core/test/makefile
index 228300b22..14f2828f2 100644
--- a/server/core/test/makefile
+++ b/server/core/test/makefile
@@ -13,7 +13,7 @@ TESTLOG := $(shell pwd)/testcore.log
 LOGPATH := $(ROOT_PATH)/log_manager
 UTILSPATH := $(ROOT_PATH)/utils
 
-LDFLAGS=-rdynamic -L$(LOGPATH) \
+LDFLAGS=-rdynamic -L$(LOGPATH) -L$(EMBEDDED_LIB) \
 	-Wl,-rpath,$(DEST)/lib \
 	-Wl,-rpath,$(LOGPATH) -Wl,-rpath,$(UTILSPATH) \
 	-Wl,-rpath,$(EMBEDDED_LIB)
diff --git a/server/modules/filter/Makefile b/server/modules/filter/Makefile
index 49a5e9f23..f09add659 100644
--- a/server/modules/filter/Makefile
+++ b/server/modules/filter/Makefile
@@ -30,7 +30,7 @@ CFLAGS=-c -fPIC -I/usr/include -I../include -I../../include -I$(LOGPATH) -I$(QCL
 
 include ../../../makefile.inc
 
-LDFLAGS=-shared  -L$(LOGPATH) -L$(QCLASSPATH) -Wl,-rpath,$(DEST)/lib \
+LDFLAGS=-shared  -L$(LOGPATH) -L$(EMBEDDED_LIB) -L$(QCLASSPATH) -Wl,-rpath,$(DEST)/lib \
 	-Wl,-rpath,$(LOGPATH) -Wl,-rpath,$(UTILSPATH)
 
 TESTSRCS=testfilter.c
@@ -80,7 +80,7 @@ libtopfilter.so: $(TOPNOBJ)
 libtee.so: $(TEEOBJ)
 	$(CC) $(LDFLAGS) $(TEEOBJ) $(LIBS) -o $@
 
-libhintfilter.so: 
+libhintfilter.so:
 	(cd hint; touch depend.mk ; make; cp $@ ..)
 
 .c.o:
diff --git a/server/test/MaxScale_test.cnf b/server/test/MaxScale_test.cnf
index 9fff8fa08..7c2e8972e 100644
--- a/server/test/MaxScale_test.cnf
+++ b/server/test/MaxScale_test.cnf
@@ -51,15 +51,19 @@ type=service
 router=readwritesplit
 servers=server1,server2,server3,server4
 max_slave_connections=90%
+write_ses_variables_to_all=Yes
+read_ses_variables_from_slaves=Yes
 user=maxuser
 passwd=maxpwd
-
+filters=Hint
 
 [RW Split Hint Router]
 type=service
 router=readwritesplit
 servers=server1,server2,server3,server4
 max_slave_connections=90%
+write_ses_variables_to_all=Yes
+read_ses_variables_from_slaves=Yes
 user=maxuser
 passwd=maxpwd
 filters=Hint