Update of /cvsroot/monetdb/sql/src/common
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19050/src/common
Modified Files:
sql_types.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_types.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/common/sql_types.mx,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- sql_types.mx 2 Jul 2007 15:48:08 -0000 1.90
+++ sql_types.mx 17 Aug 2007 14:58:07 -0000 1.91
@@ -1387,10 +1387,9 @@
}
}
- for (t = decimals; t < dates; t++) {
- sql_create_func("truncate", "sql", "trunc", *t, INT, *t,
SCALE_NONE);
- sql_create_func("round", "sql", "round", *t, BTE, *t,
SCALE_NONE);
}
+ for (t = decimals; t < dates; t++)
+ sql_create_func("round", "sql", "round", *t, BTE, *t,
SCALE_NONE);
for (t = numerical; t < end; t++) {
sql_type **u;
-------------------------------------------------------------------------
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
