Changeset: a75e7cdc6bac for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a75e7cdc6bac
Modified Files:
MonetDB.spec
clients/mapiclient/mclient.c
clients/mapilib/mapi.c
sql/backends/monet5/sql_optimizer.mx
sql/server/rel_bin.c
sql/server/rel_select.c
tools/merovingian/daemon/argvcmds.c
Branch: default
Log Message:
Merged from Apr2011
diffs (127 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -265,9 +265,8 @@
%{gemdir}/cache/*.gem
%dir %{gemdir}/gems/activerecord-monetdb-adapter-0.1
%dir %{gemdir}/gems/ruby-monetdb-sql-0.1
-%{gemdir}/gems/activerecord-monetdb-adapter-0.1/*
-%{gemdir}/gems/ruby-monetdb-sql-0.1/*
-%{gemdir}/gems/ruby-monetdb-sql-0.1/.require_paths
+%{gemdir}/gems/activerecord-monetdb-adapter-0.1
+%{gemdir}/gems/ruby-monetdb-sql-0.1
%{gemdir}/specifications/*.gemspec
%package client-tests
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -1712,7 +1712,6 @@
size_t length;
MapiHdl hdl = mapi_get_active(mid);
MapiMsg rc = MOK;
- int sent = 0; /* whether we sent any data to the server */
int lineno = 1;
enum hmyesno hassysfuncs = UNKNOWN;
@@ -2313,7 +2312,6 @@
assert(hdl != NULL);
if (length > 0) {
- sent = 1;
SQLsetSpecial(line);
mapi_query_part(hdl, line, length);
CHECK_RESULT(mid, hdl, buf, continue);
diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -1255,7 +1255,7 @@
stream *
mapi_get_from(Mapi mid)
{
- mapi_check0(mid, "mapi_get_to");
+ mapi_check0(mid, "mapi_get_from");
return mid->from;
}
diff --git a/monetdb5/mal/mal_import.mx b/monetdb5/mal/mal_import.mx
--- a/monetdb5/mal/mal_import.mx
+++ b/monetdb5/mal/mal_import.mx
@@ -184,7 +184,7 @@
str filename;
str p;
- bstream *oldfdin = c->fdin, *cfdin;
+ bstream *oldfdin = c->fdin;
int oldyycur = c->yycur;
int oldlisting = c->listing;
int oldmode = c->mode;
@@ -213,7 +213,6 @@
c->yycur = 0;
c->bak = NULL;
if ((s = malLoadScript(c, filename, &c->fdin)) == 0) {
- cfdin = c->fdin;
parseMAL(c, c->curprg);
bstream_destroy(c->fdin);
}
diff --git a/sql/backends/monet5/sql_optimizer.mx
b/sql/backends/monet5/sql_optimizer.mx
--- a/sql/backends/monet5/sql_optimizer.mx
+++ b/sql/backends/monet5/sql_optimizer.mx
@@ -486,7 +486,7 @@
str
SQLvalidatePipeline(void){
- int mitosis= FALSE, deadcode= FALSE, mergetable= FALSE, replication=
FALSE, multiplex=FALSE, garbage=FALSE;
+ int mitosis= FALSE, deadcode= FALSE, mergetable= FALSE,
multiplex=FALSE, garbage=FALSE;
int i;
mal_set_lock(sql_contextLock,"SQL optimizer");
@@ -506,9 +506,6 @@
if (strcmp(optimizers[i],"mergetable") == 0)
mergetable= TRUE;
else
- if (strcmp(optimizers[i],"replication") == 0)
- replication= TRUE;
- else
if (strcmp(optimizers[i],"multiplex") == 0)
multiplex= TRUE;
else
diff --git a/sql/server/rel_bin.c b/sql/server/rel_bin.c
--- a/sql/server/rel_bin.c
+++ b/sql/server/rel_bin.c
@@ -716,15 +716,8 @@
stmt *ts, *sub = NULL;
sql_table *t = rel->l;
node *n;
- char *tname = t->base.name;
(void)refs;
- if (rel->exps) {
- sql_exp *e = rel->exps->h->data;
-
- if (e->rname)
- tname = e->rname;
- }
ts = stmt_basetable(sql->sa, t, t->base.name);
assert(rel->exps);
for (n = t->columns.set->h; n; n = n->next) {
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
@@ -144,7 +144,6 @@
int
command_get(confkeyval *ckv, int argc, char *argv[])
{
- char doall = 1;
char *p;
char *dbfarm = LOCALSTATEDIR "/monetdb5/dbfarm";
char *property = NULL;
@@ -181,8 +180,6 @@
/* deduced read-only properties */
off += snprintf(property + off, 512 - off,
",mapisock,controlsock");
- } else {
- doall = 0;
}
/* chdir to dbfarm so we can open relative files (like pidfile) */
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
