Update of /cvsroot/monetdb/sql/src/backends/monet4
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19050/src/backends/monet4
Modified Files:
sql_gencode.mx
Log Message:
propagated changes of Wednesday Aug 01 2007 - Friday Aug 17 2007
from the SQL_2-18 branch to the development trunk
There were conflicts in the following files:
src/benchmarks/arno/Tests/check0a.stable.out
src/benchmarks/arno/Tests/check1a.stable.out
src/common/sql_types.mx
src/test/BugTracker/Tests/All
src/test/Tests/rank.stable.out
src/test/leaks/Tests/check0.stable.out
src/test/leaks/Tests/check1.stable.out
src/test/leaks/Tests/check2.stable.out
src/test/leaks/Tests/check3.stable.out
src/test/leaks/Tests/check4.stable.out
src/test/leaks/Tests/check5.stable.out
Please have a look at my resolution of src/common/sql_types.mx.
I have not attempted to resolve the conflicts in the stable.out files,
so please take a look and approve if necessary.
Index: sql_gencode.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet4/sql_gencode.mx,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -d -r1.153 -r1.154
--- sql_gencode.mx 29 Jun 2007 11:28:42 -0000 1.153
+++ sql_gencode.mx 17 Aug 2007 14:58:04 -0000 1.154
@@ -785,7 +785,7 @@
/* convert to string is complex, we need full type info
and mvc for the timezone */
- if (s->op4.typeval.type->eclass == EC_STRING &&
+ if (EC_VARCHAR(s->op4.typeval.type->eclass) &&
!(s->op3.typeval.type->eclass == EC_STRING &&
s->op4.typeval.digits == 0) )
len += snprintf(buf+len, buflen-len, "myc, %d,
%u, %u, %d, ", s->op3.typeval.type->eclass, s->op3.typeval.digits,
s->op3.typeval.scale, type_has_tz(&s->op3.typeval));
@@ -798,7 +798,7 @@
s->op4.typeval.type->eclass == EC_INTERVAL)
len += snprintf(buf+len, buflen-len, ", %u,
%u", s->op4.typeval.digits, s->op4.typeval.scale);
/* convert to string, give error on to large strings */
- if (s->op4.typeval.type->eclass == EC_STRING &&
+ if (EC_VARCHAR(s->op4.typeval.type->eclass) &&
!(s->op3.typeval.type->eclass == EC_STRING &&
s->op4.typeval.digits == 0) )
len += snprintf(buf+len, buflen-len, ", %u",
s->op4.typeval.digits);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
