Changeset: 7bb92d708f9a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7bb92d708f9a
Modified Files:
tools/merovingian/client/monetdb.c
tools/merovingian/daemon/argvcmds.c
tools/merovingian/daemon/controlrunner.c
tools/merovingian/daemon/merovingian.c
tools/merovingian/daemon/merovingian.h
tools/merovingian/daemon/proxy.c
Branch: default
Log Message:
Removed private version numbers for monetdb and monetdbd.
They hadn't been changed since 2012, even though the programs had. We
now just use the global version number.
diffs (89 lines):
diff --git a/tools/merovingian/client/monetdb.c
b/tools/merovingian/client/monetdb.c
--- a/tools/merovingian/client/monetdb.c
+++ b/tools/merovingian/client/monetdb.c
@@ -19,8 +19,6 @@
* primary goals of this tool.
*/
-#define TOOLKIT_VERSION "1.1"
-
#include "monetdb_config.h"
#include "utils.h"
#include "properties.h"
@@ -180,7 +178,7 @@ static void
command_version(void)
{
printf("MonetDB Database Server Toolkit v%s (%s)\n",
- TOOLKIT_VERSION, MONETDB_RELEASE);
+ VERSION, MONETDB_RELEASE);
}
static int
diff --git a/tools/merovingian/daemon/argvcmds.c
b/tools/merovingian/daemon/argvcmds.c
--- a/tools/merovingian/daemon/argvcmds.c
+++ b/tools/merovingian/daemon/argvcmds.c
@@ -66,7 +66,7 @@ int
command_version(void)
{
printf("MonetDB Database Server v%s (%s)\n",
- MERO_VERSION, MONETDB_RELEASE);
+ VERSION, MONETDB_RELEASE);
return(0);
}
diff --git a/tools/merovingian/daemon/controlrunner.c
b/tools/merovingian/daemon/controlrunner.c
--- a/tools/merovingian/daemon/controlrunner.c
+++ b/tools/merovingian/daemon/controlrunner.c
@@ -780,7 +780,7 @@ static void ctl_handle_client(
len = snprintf(buf2, sizeof(buf2), "OK\n");
send_client("=");
len = snprintf(buf2, sizeof(buf2), "%s (%s)\n",
- MERO_VERSION, MONETDB_RELEASE);
+ VERSION, MONETDB_RELEASE);
send_client("=");
break;
} else if (strcmp(p, "mserver") == 0) {
diff --git a/tools/merovingian/daemon/merovingian.c
b/tools/merovingian/daemon/merovingian.c
--- a/tools/merovingian/daemon/merovingian.c
+++ b/tools/merovingian/daemon/merovingian.c
@@ -884,7 +884,7 @@ main(int argc, char *argv[])
fclose(pidfile);
Mfprintf(stdout, "Merovingian %s (%s) starting\n",
- MERO_VERSION, MONETDB_RELEASE);
+ VERSION, MONETDB_RELEASE);
Mfprintf(stdout, "monitoring dbfarm %s\n", dbfarm);
/* open up connections */
@@ -1027,7 +1027,7 @@ shutdown:
/* need to do this here, since the logging thread is shut down as
* next thing */
- Mfprintf(stdout, "Merovingian %s stopped\n", MERO_VERSION);
+ Mfprintf(stdout, "Merovingian %s stopped\n", VERSION);
_mero_keep_logging = 0;
if (tid != 0 && (argp = pthread_join(tid, NULL)) != 0) {
diff --git a/tools/merovingian/daemon/merovingian.h
b/tools/merovingian/daemon/merovingian.h
--- a/tools/merovingian/daemon/merovingian.h
+++ b/tools/merovingian/daemon/merovingian.h
@@ -14,7 +14,6 @@
#include "utils/utils.h" /* confkeyval */
-#define MERO_VERSION "1.7"
#define MERO_PORT "50000"
#define MERO_SOCK ".s.monetdb."
#define CONTROL_SOCK ".s.merovingian."
diff --git a/tools/merovingian/daemon/proxy.c b/tools/merovingian/daemon/proxy.c
--- a/tools/merovingian/daemon/proxy.c
+++ b/tools/merovingian/daemon/proxy.c
@@ -334,7 +334,7 @@ handleMySQLClient(int sock)
/* Handshake Initialization Packet */
p = buf + 4; /* skip bytes for package header */
*p++ = 0x10; /* protocol_version */
- p += sprintf(p, MERO_VERSION "-merovingian") + 1; /* server_version\0 */
+ p += sprintf(p, VERSION "-merovingian") + 1; /* server_version\0 */
le_int(p, 0); /* thread_number */
p += sprintf(p, "voidvoid"); /* scramble_buff */
*p++ = 0x00; /* filler */
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
