Changeset: 91e56aa7bc6d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=91e56aa7bc6d
Modified Files:
MonetDB4/MonetDB-server.spec
MonetDB5/MonetDB-server.spec
clients/src/mapiclient/mclient.mx
sql/src/backends/monet5/merovingian/merovingian.c
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (231 lines):
diff -r 678d0587376a -r 91e56aa7bc6d MonetDB4/MonetDB-server.spec
--- a/MonetDB4/MonetDB-server.spec Wed Jul 21 20:38:53 2010 +0200
+++ b/MonetDB4/MonetDB-server.spec Thu Jul 22 09:48:43 2010 +0200
@@ -136,7 +136,7 @@
make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/MonetDB
-mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/MonetDB4
+mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/MonetDB4/dbfarm
# insert example db here!
# cleanup stuff we don't want to install
@@ -190,8 +190,9 @@
%{_libdir}/MonetDB4/lib/*.so*
%{_libdir}/MonetDB4/*.mil
-%attr(770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB
-%attr(770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB4
+%attr(750,monetdb,monetdb) %dir %{_localstatedir}/MonetDB
+%attr(2770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB4
+%attr(2770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB4/dbfarm
%config(noreplace) %{_sysconfdir}/MonetDB.conf
diff -r 678d0587376a -r 91e56aa7bc6d MonetDB4/debian/monetdb4-server.dirs
--- a/MonetDB4/debian/monetdb4-server.dirs Wed Jul 21 20:38:53 2010 +0200
+++ b/MonetDB4/debian/monetdb4-server.dirs Thu Jul 22 09:48:43 2010 +0200
@@ -1,1 +1,2 @@
/var/MonetDB4
+/var/MonetDB4/dbfarm
diff -r 678d0587376a -r 91e56aa7bc6d MonetDB4/debian/monetdb4-server.postinst
--- a/MonetDB4/debian/monetdb4-server.postinst Wed Jul 21 20:38:53 2010 +0200
+++ b/MonetDB4/debian/monetdb4-server.postinst Thu Jul 22 09:48:43 2010 +0200
@@ -10,9 +10,9 @@
if ! getent passwd monetdb > /dev/null; then
adduser --system --ingroup monetdb --home /var/lib/monetdb
--disabled-password --shell /usr/sbin/nologin monetdb
fi
- mkdir -p /var/MonetDB4
- chown monetdb:monetdb /var/MonetDB4
- chmod ug=rwx,o= /var/MonetDB4
+ mkdir -p /var/MonetDB4/dbfarm
+ chown monetdb:monetdb /var/MonetDB4 /var/MonetDB4/dbfarm
+ chmod ug=rwx,g+s,o= /var/MonetDB4 /var/MonetDB4/dbfarm
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff -r 678d0587376a -r 91e56aa7bc6d MonetDB5/MonetDB-server.spec
--- a/MonetDB5/MonetDB-server.spec Wed Jul 21 20:38:53 2010 +0200
+++ b/MonetDB5/MonetDB-server.spec Thu Jul 22 09:48:43 2010 +0200
@@ -133,7 +133,7 @@
make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/MonetDB
-mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/MonetDB5
+mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/MonetDB5/dbfarm
# insert example db here!
# cleanup stuff we don't want to install
@@ -183,8 +183,9 @@
%dir %{_libdir}/MonetDB5/lib
%dir %{_libdir}/MonetDB5/autoload
-%attr(770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB
-%attr(770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB5
+%attr(750,monetdb,monetdb) %dir %{_localstatedir}/MonetDB
+%attr(2770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB5
+%attr(2770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB5/dbfarm
%config(noreplace) %{_sysconfdir}/monetdb5.conf
%{_mandir}/man5/monetdb5.conf.5.gz
diff -r 678d0587376a -r 91e56aa7bc6d MonetDB5/debian/monetdb5-server.dirs
--- a/MonetDB5/debian/monetdb5-server.dirs Wed Jul 21 20:38:53 2010 +0200
+++ b/MonetDB5/debian/monetdb5-server.dirs Thu Jul 22 09:48:43 2010 +0200
@@ -1,1 +1,2 @@
/var/MonetDB5
+/var/MonetDB5/dbfarm
diff -r 678d0587376a -r 91e56aa7bc6d MonetDB5/debian/monetdb5-server.postinst
--- a/MonetDB5/debian/monetdb5-server.postinst Wed Jul 21 20:38:53 2010 +0200
+++ b/MonetDB5/debian/monetdb5-server.postinst Thu Jul 22 09:48:43 2010 +0200
@@ -10,9 +10,9 @@
if ! getent passwd monetdb > /dev/null; then
adduser --system --ingroup monetdb --home /var/lib/monetdb
--disabled-password --shell /usr/sbin/nologin monetdb
fi
- mkdir -p /var/MonetDB5
- chown monetdb:monetdb /var/MonetDB5
- chmod ug=rwx,o= /var/MonetDB5
+ mkdir -p /var/MonetDB5/dbfarm
+ chown monetdb:monetdb /var/MonetDB5 /var/MonetDB5/dbfarm
+ chmod ug=rwx,g+s,o= /var/MonetDB5 /var/MonetDB5/dbfarm
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff -r 678d0587376a -r 91e56aa7bc6d clients/ChangeLog.Jun2010
--- a/clients/ChangeLog.Jun2010 Wed Jul 21 20:38:53 2010 +0200
+++ b/clients/ChangeLog.Jun2010 Thu Jul 22 09:48:43 2010 +0200
@@ -1,6 +1,9 @@
# ChangeLog file for clients
# This file is updated with Maddlog
+* Wed Jul 21 2010 Fabian Groffen <fab...@cwi.nl>
+- Add --version option to mclient.
+
* Tue Jul 20 2010 Sjoerd Mullender <sjo...@acm.org>
- In case of an incomplete line from the server, add a newline.
This fixes bug 2619.
diff -r 678d0587376a -r 91e56aa7bc6d clients/src/mapiclient/mclient.mx
--- a/clients/src/mapiclient/mclient.mx Wed Jul 21 20:38:53 2010 +0200
+++ b/clients/src/mapiclient/mclient.mx Thu Jul 22 09:48:43 2010 +0200
@@ -2219,6 +2219,7 @@
{"statement", 1, 0, 's'},
{"time", 0, 0, 't'},
{"user", 1, 0, 'u'},
+ {"version", 0, 0, 'v'},
{"width", 1, 0, 'w'},
{"Xdebug", 0, 0, 'X'},
{0, 0, 0, 0}
@@ -2341,7 +2342,7 @@
#ifdef HAVE_POPEN
"|:"
#endif
- "w:r:p:s:tXu:H?",
+ "w:r:p:s:tXu:vH?",
long_options, &option_index)) != -1) {
switch (c) {
case 0:
@@ -2454,6 +2455,15 @@
case 'H':
save_history = 1;
break;
+ case 'v':
+ stream_printf(toConsole,
+ "mclient, the MonetDB interactive
terminal (%s)\n",
+ MONETDB_RELEASE);
+#ifdef HAVE_LIBREADLINE
+ stream_printf(toConsole,
+ "support for command-line editing
compiled-in\n");
+#endif
+ return(0);
case '?':
/* a bit of a hack: look at the option that the
current `c' is based on and see if we recognize
diff -r 678d0587376a -r 91e56aa7bc6d
sql/src/backends/monet5/merovingian/ChangeLog.Jun2010
--- a/sql/src/backends/monet5/merovingian/ChangeLog.Jun2010 Wed Jul 21
20:38:53 2010 +0200
+++ b/sql/src/backends/monet5/merovingian/ChangeLog.Jun2010 Thu Jul 22
09:48:43 2010 +0200
@@ -1,6 +1,9 @@
# ChangeLog file for sql/src/backends/monet5/merovingian
# This file is updated with mchangelog
+ 21 Jul 2010; Fabian Groffen <fab...@cwi.nl> merovingian.c, monetdb.c:
+ Report MonetDB release on --version flags and in the logs.
+
16 Jul 2010; Fabian Groffen <fab...@cwi.nl> merovingian.c,
merovingian_forkmserver.c, monetdb.1.in, properties.c:
Remove references to master/slave settings, since replication isn't yet
diff -r 678d0587376a -r 91e56aa7bc6d
sql/src/backends/monet5/merovingian/merovingian.c
--- a/sql/src/backends/monet5/merovingian/merovingian.c Wed Jul 21 20:38:53
2010 +0200
+++ b/sql/src/backends/monet5/merovingian/merovingian.c Thu Jul 22 09:48:43
2010 +0200
@@ -672,8 +672,8 @@
gethostname(_mero_hostname, 128);
if (argc > 1) {
- Mfprintf(stderr, "Merovingian %s on host %s\n", MERO_VERSION,
- _mero_hostname /*FIXME not yet set*/);
+ Mfprintf(stderr, "Merovingian %s (%s) on host %s\n",
MERO_VERSION,
+ MONETDB_RELEASE, _mero_hostname);
Mfprintf(stderr, "Using config file: %s\n", _mero_conffile);
Mfprintf(stderr, " monitoring dbfarm: %s\n", dbfarm);
Mfprintf(stderr, " forking mserver5: %s\n", _mero_mserver);
@@ -682,6 +682,7 @@
Mfprintf(stderr, " performs neighbour discovery: %s\n",
(discoveryport != 0 ? "yes" : "no"));
MERO_EXIT(0);
+ return(0);
}
/* seed the randomiser for when we create a database, send responses
@@ -912,7 +913,8 @@
MERO_EXIT(1);
}
- Mfprintf(stdout, "Merovingian %s starting\n", MERO_VERSION);
+ Mfprintf(stdout, "Merovingian %s (%s) starting\n",
+ MERO_VERSION, MONETDB_RELEASE);
Mfprintf(stdout, "monitoring dbfarm %s\n", dbfarm);
SABAOTHinit(dbfarm, NULL);
diff -r 678d0587376a -r 91e56aa7bc6d
sql/src/backends/monet5/merovingian/monetdb.c
--- a/sql/src/backends/monet5/merovingian/monetdb.c Wed Jul 21 20:38:53
2010 +0200
+++ b/sql/src/backends/monet5/merovingian/monetdb.c Thu Jul 22 09:48:43
2010 +0200
@@ -185,7 +185,8 @@
static void
command_version()
{
- printf("MonetDB Database Server Toolkit v%s\n", TOOLKIT_VERSION);
+ printf("MonetDB Database Server Toolkit v%s (%s)\n",
+ TOOLKIT_VERSION, MONETDB_RELEASE);
}
/**
@@ -1429,6 +1430,22 @@
}
}
break;
+ case '-':
+ /* skip -- */
+ if (argv[i][2] == '\0')
+ break;
+ if (strcmp(&argv[i][2], "version") == 0) {
+ command_version();
+ return(0);
+ } else if (strcmp(&argv[i][2], "help") == 0) {
+ command_help(0, NULL);
+ return(0);
+ }
+ default:
+ fprintf(stderr, "monetdb: unknown option:
%s\n", argv[i]);
+ command_help(0, NULL);
+ return(1);
+ break;
}
}
@@ -1453,7 +1470,7 @@
}
/* commands that do not need merovingian to be running */
- if (strcmp(argv[i], "help") == 0 || strcmp(argv[i], "--help") == 0) {
+ if (strcmp(argv[i], "help") == 0) {
command_help(argc - i, &argv[i]);
return(0);
} else if (strcmp(argv[i], "version") == 0) {
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
