diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-08-03 15:33:19 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-08-03 15:33:19 +0000 |
commit | 596b6f94df8bdb8d22268552d52e2c64759d6007 (patch) | |
tree | eb6c9b6e2455607a75105da370fade05a44743af /src | |
parent | 854ced49cd342c2318c7caad411def8d7be0e1d9 (diff) | |
download | gnunet-596b6f94df8bdb8d22268552d52e2c64759d6007.tar.gz gnunet-596b6f94df8bdb8d22268552d52e2c64759d6007.zip |
fixes
Diffstat (limited to 'src')
-rw-r--r-- | src/datastore/Makefile.am | 2 | ||||
-rw-r--r-- | src/datastore/plugin_datastore_mysql.c | 5 | ||||
-rw-r--r-- | src/datastore/test_datastore_api_data_mysql.conf | 6 |
3 files changed, 7 insertions, 6 deletions
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 = \ | |||
73 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 73 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
74 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lz -lsqlite3 | 74 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lz -lsqlite3 |
75 | libgnunet_plugin_datastore_mysql_la_LDFLAGS = \ | 75 | libgnunet_plugin_datastore_mysql_la_LDFLAGS = \ |
76 | $(GN_PLUGIN_LDFLAGS) $(MYSQL_LDFLAGS) | 76 | $(GN_PLUGIN_LDFLAGS) -lmysqlclient |
77 | libgnunet_plugin_datastore_sqlite_la_CPFLAGS = \ | 77 | libgnunet_plugin_datastore_sqlite_la_CPFLAGS = \ |
78 | $(MYSQL_CPPFLAGS) | 78 | $(MYSQL_CPPFLAGS) |
79 | 79 | ||
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 @@ | |||
49 | * | 49 | * |
50 | * 1) in /etc/gnunet.conf, set | 50 | * 1) in /etc/gnunet.conf, set |
51 | * <pre> | 51 | * <pre> |
52 | * | 52 | * [datastore] |
53 | * sqstore = "sqstore_mysql" | 53 | * DATABASE = "mysql" |
54 | * | ||
55 | * </pre> | 54 | * </pre> |
56 | * 2) Then access mysql as root, | 55 | * 2) Then access mysql as root, |
57 | * <pre> | 56 | * <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; | |||
21 | QUOTA = 10000000 | 21 | QUOTA = 10000000 |
22 | BLOOMFILTER = $SERVICEHOME/fs/bloomfilter | 22 | BLOOMFILTER = $SERVICEHOME/fs/bloomfilter |
23 | DATABASE = mysql | 23 | DATABASE = mysql |
24 | DISABLE_SOCKET_FORWARDING = YES | ||
24 | # USERNAME = | 25 | # USERNAME = |
25 | # MAXBUF = | 26 | # MAXBUF = |
26 | # TIMEOUT = | 27 | # TIMEOUT = |
@@ -30,8 +31,9 @@ DATABASE = mysql | |||
30 | # REJECT_FROM6 = | 31 | # REJECT_FROM6 = |
31 | # PREFIX = | 32 | # PREFIX = |
32 | # DEBUG = YES | 33 | # DEBUG = YES |
33 | #PREFIX = valgrind --tool=memcheck --leak-check=yes | 34 | PREFIX = xterm -T datastore -e gdb --args |
34 | #BINARY = /home/grothoff/bin/gnunet-service-datastore | 35 | # PREFIX = valgrind --tool=memcheck --leak-check=yes |
36 | BINARY = /home/grothoff/gn9/bin/gnunet-service-datastore | ||
35 | 37 | ||
36 | [statistics] | 38 | [statistics] |
37 | PORT = 22667 | 39 | PORT = 22667 |