Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24471/src/backends/monet5
Modified Files:
Tag: GDK-2
prog.c sql.mx sql_optimizer.mx sql_result.mx
Log Message:
propagated changes of Thursday Sep 06 2007 - Monday Sep 10 2007
from the development trunk to the GDK-2 branch
Index: sql_result.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_result.mx,v
retrieving revision 1.60.2.4
retrieving revision 1.60.2.5
diff -u -d -r1.60.2.4 -r1.60.2.5
--- sql_result.mx 6 Sep 2007 13:51:59 -0000 1.60.2.4
+++ sql_result.mx 10 Sep 2007 14:47:11 -0000 1.60.2.5
@@ -803,6 +803,7 @@
int ok = 1;
size_t count = 0;
+ mtype = ATOMstorage(mtype);
if (mtype == TYPE_str) {
if (eclass == EC_CHAR) {
ok = mvc_send_int(s, digits);
Index: prog.c
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/prog.c,v
retrieving revision 1.6
retrieving revision 1.6.4.1
diff -u -d -r1.6 -r1.6.4.1
--- prog.c 27 Apr 2007 09:45:50 -0000 1.6
+++ prog.c 10 Sep 2007 14:47:08 -0000 1.6.4.1
@@ -100,7 +100,6 @@
/* needed, to prevent the MonetDB config file to be used */
setlen = mo_add_option(&set, setlen, opt_config, "prefix",
MONETDBPREFIX);
setlen = mo_add_option(&set, setlen, opt_config, "config",
MONETDBCONFIG);
- setlen = mo_system_config(&set, setlen);
for (;;) {
int option_index = 0;
@@ -154,6 +153,8 @@
}
}
+ setlen = mo_system_config(&set, setlen);
+
mid = embedded_sql(set, setlen);
/* now for each file given on the command line (or stdin)
Index: sql_optimizer.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_optimizer.mx,v
retrieving revision 1.158.2.1
retrieving revision 1.158.2.2
diff -u -d -r1.158.2.1 -r1.158.2.2
--- sql_optimizer.mx 21 Aug 2007 14:07:59 -0000 1.158.2.1
+++ sql_optimizer.mx 10 Sep 2007 14:47:08 -0000 1.158.2.2
@@ -490,7 +490,7 @@
nxt++;
}
if (strcmp(optimizer,"default")==0){
- str base= GDKstrdup(defaultPlan);
+ str base= GDKstrdup(defaultPlan?
defaultPlan:minimalPlan);
addOptimizers(c,mb,base);
GDKfree(base);
} else if ((nme = getName(optimizer,strlen(optimizer))) == 0) {
@@ -543,7 +543,7 @@
}
optimizer = stack_get_string(be->mvc, "optimizer");
if( optimizer == 0 )
- optimizer= defaultPlan;
+ optimizer= defaultPlan? defaultPlan:minimalPlan;
#ifdef _SQL_OPTIMIZER_DEBUG
if( optimizer)
stream_printf(c->fdout,"optimizer:%s:\n",optimizer?optimizer:"unknown");
@@ -557,10 +557,10 @@
care of.
@c
if( strcmp(optimizer,"on")==0 || strcmp(optimizer,"default")==0 ){
- str base = GDKstrdup(defaultPlan);
+ str base = GDKstrdup(defaultPlan? defaultPlan:minimalPlan);
stack_set_var(be->mvc, "optimizer",
- VALset(&src, TYPE_str, defaultPlan));
+ VALset(&src, TYPE_str, defaultPlan?
defaultPlan:minimalPlan));
addOptimizers(c,mb, base);
optimizeMALBlock(mb);
GDKfree(base);
Index: sql.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql.mx,v
retrieving revision 1.230.2.4
retrieving revision 1.230.2.5
diff -u -d -r1.230.2.4 -r1.230.2.5
--- sql.mx 6 Sep 2007 13:51:58 -0000 1.230.2.4
+++ sql.mx 10 Sep 2007 14:47:08 -0000 1.230.2.5
@@ -221,6 +221,21 @@
return b;
end sql_environment;
+function clients():bat[:str,:bat];
+ b := bat.new(:str,:bat,5);
+ u:= clients.getUsers();
+ bat.insert(b,"user",u);
+ l:= clients.getLogins();
+ bat.insert(b,"login",l);
+ c:= clients.getLastCommand();
+ bat.insert(b,"lastcommand",c);
+ a:= clients.getActions();
+ bat.insert(b,"actions",a);
+ t:= clients.getTime();
+ bat.insert(b,"seconds",t);
+ return b;
+end clients;
+
function bbp():bat[:str,:bat];
b := bat.new(:str,:bat,12);
ns := bbp.getNames();
@@ -777,7 +792,6 @@
#include "sql_gencode.h"
#include <sql_storage.h>
#include <store_sequence.h>
-#include <bat/res_table.h>
#include <sql_datetime.h>
#include <rel_optimizer.h>
#include <rel_bin.h>
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
