[GNUnet-SVN] r12447 - gnunet/src/datastore

[gnunet]

Author: grothoff
Date: 2010-08-03 17:33:19 +0200 (Tue, 03 Aug 2010)
New Revision: 12447

Modified:
   gnunet/src/datastore/Makefile.am
   gnunet/src/datastore/plugin_datastore_mysql.c
   gnunet/src/datastore/test_datastore_api_data_mysql.conf
Log:
fixes

Modified: gnunet/src/datastore/Makefile.am
===================================================================
--- gnunet/src/datastore/Makefile.am    2010-08-03 15:30:46 UTC (rev 12446)
+++ gnunet/src/datastore/Makefile.am    2010-08-03 15:33:19 UTC (rev 12447)
@@ -73,7 +73,7 @@
   $(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)
 

Modified: gnunet/src/datastore/plugin_datastore_mysql.c
===================================================================
--- gnunet/src/datastore/plugin_datastore_mysql.c       2010-08-03 15:30:46 UTC 
(rev 12446)
+++ gnunet/src/datastore/plugin_datastore_mysql.c       2010-08-03 15:33:19 UTC 
(rev 12447)
@@ -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>

Modified: gnunet/src/datastore/test_datastore_api_data_mysql.conf
===================================================================
--- gnunet/src/datastore/test_datastore_api_data_mysql.conf     2010-08-03 
15:30:46 UTC (rev 12446)
+++ gnunet/src/datastore/test_datastore_api_data_mysql.conf     2010-08-03 
15:33:19 UTC (rev 12447)
@@ -21,6 +21,7 @@
 QUOTA = 10000000
 BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
 DATABASE = mysql
+DISABLE_SOCKET_FORWARDING = YES
 # USERNAME = 
 # MAXBUF =
 # TIMEOUT =
@@ -30,8 +31,9 @@
 # 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