Update of /cvsroot/monetdb/sql/src/backends/monet5/merovingian
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30904
Modified Files:
Tag: Nov2009
ChangeLog.Nov2009 merovingian.c merovingian_forkmserver.c
monetdb.c properties.c
Log Message:
-----------------------!!!!!----------------------
!!!!!! THIS COMMIT SHOULD NOT BE PROPAGATED !!!!!!
==================================================
Remove references to replication (master/slave) etc. since it doesn't
work in this release, so we shouldn't offer it either.
This commit should NOT be propagated to the development trunk.
Index: merovingian_forkmserver.c
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/backends/monet5/merovingian/merovingian_forkmserver.c,v
retrieving revision 1.3.2.5
retrieving revision 1.3.2.6
diff -u -d -r1.3.2.5 -r1.3.2.6
--- merovingian_forkmserver.c 8 Oct 2009 13:11:40 -0000 1.3.2.5
+++ merovingian_forkmserver.c 4 Nov 2009 11:45:22 -0000 1.3.2.6
@@ -222,10 +222,8 @@
str muri = alloca(sizeof(char) * 512); /* possibly undersized */
char mydoproxy;
str nthreads = NULL;
- str master = NULL;
- str slave = NULL;
str pipeline = NULL;
- str argv[25]; /* for the exec arguments */
+ str argv[21]; /* for the exec arguments */
confkeyval *ckv, *kv;
int c = 0;
@@ -253,21 +251,6 @@
snprintf(pipeline, 512, "sql_optimizer=%s", kv->val);
}
- kv = findConfKey(ckv, "master");
- /* can't have master configured by default */
- if (kv->val != NULL && strcmp(kv->val, "yes") == 0) {
- master = alloca(sizeof(char) * 24);
- snprintf(master, 24, "replication_master=true");
- }
-
- kv = findConfKey(ckv, "slave");
- /* can't have slave configured by default */
- if (kv->val != NULL) {
- size_t len = 24 + strlen(kv->val);
- slave = alloca(sizeof(char) * len);
- snprintf(slave, len, "replication_slave=%s", kv->val);
- }
-
freeConfFile(ckv);
GDKfree(ckv); /* can make ckv static and reuse it all the time
*/
@@ -312,12 +295,6 @@
if (pipeline != NULL) {
argv[c++] = "--set"; argv[c++] = pipeline;
}
- if (master != NULL) {
- argv[c++] = "--set"; argv[c++] = master;
- }
- if (slave != NULL) {
- argv[c++] = "--set"; argv[c++] = slave;
- }
argv[c++] = NULL;
fprintf(stdout, "arguments:");
Index: monetdb.c
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/merovingian/monetdb.c,v
retrieving revision 1.65.2.6
retrieving revision 1.65.2.7
diff -u -d -r1.65.2.6 -r1.65.2.7
--- monetdb.c 8 Oct 2009 12:51:42 -0000 1.65.2.6
+++ monetdb.c 4 Nov 2009 11:45:22 -0000 1.65.2.7
@@ -1277,7 +1277,6 @@
{"gdk_nr_threads", NULL, INT},
{"mero_doproxy", GDKstrdup("yes"), BOOL},
{"mero_discoveryport", NULL, INT},
- {"#master", GDKstrdup("no"), BOOL},
{ NULL, NULL, INVALID}
};
confkeyval *kv;
Index: merovingian.c
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/merovingian/merovingian.c,v
retrieving revision 1.65.2.3
retrieving revision 1.65.2.4
diff -u -d -r1.65.2.3 -r1.65.2.4
--- merovingian.c 8 Oct 2009 12:51:42 -0000 1.65.2.3
+++ merovingian.c 4 Nov 2009 11:45:22 -0000 1.65.2.4
@@ -608,10 +608,6 @@
snprintf(buf, sizeof(buf), "%d", ret);
kv->val = GDKstrdup(buf);
}
- kv = findConfKey(_mero_props, "master");
- kv->val = GDKstrdup("no");
- kv = findConfKey(_mero_props, "slave");
- kv->val = NULL; /* MURI */
kv = findConfKey(ckv, "sql_optimizer");
p = kv->val;
if (p != NULL) {
Index: properties.c
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/merovingian/properties.c,v
retrieving revision 1.13.2.2
retrieving revision 1.13.2.3
diff -u -d -r1.13.2.2 -r1.13.2.3
--- properties.c 8 Oct 2009 12:51:42 -0000 1.13.2.2
+++ properties.c 4 Nov 2009 11:45:23 -0000 1.13.2.3
@@ -39,8 +39,6 @@
{"shared", NULL, STR},
{"nthreads", NULL, INT},
{"optpipe", NULL, STR},
- {"master", NULL, BOOL},
- {"slave", NULL, MURI},
{ NULL, NULL, INVALID}
};
Index: ChangeLog.Nov2009
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/backends/monet5/merovingian/ChangeLog.Nov2009,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- ChangeLog.Nov2009 26 Oct 2009 10:17:47 -0000 1.1.2.4
+++ ChangeLog.Nov2009 4 Nov 2009 11:45:22 -0000 1.1.2.5
@@ -17,10 +17,6 @@
merovingian_uri GDKenvironment setting. This can be used by applications
inside the database that need to give a pointer back to themselves.
- 30 Sep 2009; Fabian Groffen <[email protected]> merovingian.c,
- merovingian_forkmserver.c, monetdb.c, properties.c, utils.c, utils.h:
- Add slave property for databases
-
25 Sep 2009; Fabian Groffen <[email protected]> monetdb.c:
Implemented global -q option to monetdb to suppress status messages when
performing commands
@@ -49,11 +45,6 @@
No longer announce databases that are under maintenance, this allows them to
be pulled out of the cluster easily
- 04 Sep 2009; Fabian Groffen <[email protected]> merovingian_forkmserver.c,
- monetdb.c, monetdb_get.c, properties.c:
- Add master property of boolean value that translates into
- replication_master for mserver5 to trigger storing replication logs
-
20 Aug 2009; Fabian Groffen <[email protected]> database.c, database.h,
monetdb.c, monetdb.1:
Always put created databases under maintenance, they have to be explicitly
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
