From: Christian Grothoff <christian@grothoff.org>
Date: Tue, 3 Aug 2010 15:33:19 +0000 (+0000)
Subject: fixes
X-Git-Tag: initial-import-from-subversion-38251~20767
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=596b6f94df8bdb8d22268552d52e2c64759d6007;p=oweals%2Fgnunet.git

fixes
---

diff --git a/src/datastore/Makefile.am b/src/datastore/Makefile.am
index fac20f191..9fd0253f3 100644
--- a/src/datastore/Makefile.am
+++ b/src/datastore/Makefile.am
@@ -73,7 +73,7 @@ libgnunet_plugin_datastore_mysql_la_LIBADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lz -lsqlite3
 libgnunet_plugin_datastore_mysql_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS) $(MYSQL_LDFLAGS)
+ $(GN_PLUGIN_LDFLAGS) -lmysqlclient
 libgnunet_plugin_datastore_sqlite_la_CPFLAGS = \
  $(MYSQL_CPPFLAGS)
 
diff --git a/src/datastore/plugin_datastore_mysql.c b/src/datastore/plugin_datastore_mysql.c
index 447ce7176..637fb83c5 100644
--- a/src/datastore/plugin_datastore_mysql.c
+++ b/src/datastore/plugin_datastore_mysql.c
@@ -49,9 +49,8 @@
  *
  * 1) in /etc/gnunet.conf, set
  *    <pre>
- *
- *     sqstore = "sqstore_mysql"
- *
+ *     [datastore]
+ *     DATABASE = "mysql"
  *    </pre>
  * 2) Then access mysql as root,
  *    <pre>
diff --git a/src/datastore/test_datastore_api_data_mysql.conf b/src/datastore/test_datastore_api_data_mysql.conf
index a564fe9bf..a72f58a8a 100644
--- a/src/datastore/test_datastore_api_data_mysql.conf
+++ b/src/datastore/test_datastore_api_data_mysql.conf
@@ -21,6 +21,7 @@ ACCEPT_FROM6 = ::1;
 QUOTA = 10000000
 BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
 DATABASE = mysql
+DISABLE_SOCKET_FORWARDING = YES
 # USERNAME = 
 # MAXBUF =
 # TIMEOUT =
@@ -30,8 +31,9 @@ DATABASE = mysql
 # REJECT_FROM6 =
 # PREFIX =
 # DEBUG = YES
-#PREFIX = valgrind --tool=memcheck --leak-check=yes
-#BINARY = /home/grothoff/bin/gnunet-service-datastore
+PREFIX = xterm -T datastore -e gdb --args
+# PREFIX = valgrind --tool=memcheck --leak-check=yes
+BINARY = /home/grothoff/gn9/bin/gnunet-service-datastore
 
 [statistics]
 PORT = 22667