Changeset: 321914c3c706 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=321914c3c706
Modified Files:
monetdb5/modules/kernel/calc.mx
sql/ChangeLog.Aug2011
sql/common/sql_types.c
Branch: Aug2011
Log Message:
Backout changeset 998089b7cdd7: no ABI change allowed in release branch.
This means that the bug that the SQL function sign() returns the wrong
type cannot be fixed in the Aug2011 branch.
This changeset will not be propagated (i.e. the Dec2011 branch will
contain the fix).
diffs (38 lines):
diff --git a/monetdb5/modules/kernel/calc.mx b/monetdb5/modules/kernel/calc.mx
--- a/monetdb5/modules/kernel/calc.mx
+++ b/monetdb5/modules/kernel/calc.mx
@@ -341,7 +341,7 @@ comment "Concatenate two strings";
comment "negative value";
command sizeof(x:@1):int
address CALCsizeof@1;
- command sign(x:@1) :int
+ command sign(x:@1) :@1
address CALCunary@1SIGN
comment "Returns +1, 0, -1 based on the sign of the given
expression";
@= unary_ops
diff --git a/sql/ChangeLog.Aug2011 b/sql/ChangeLog.Aug2011
--- a/sql/ChangeLog.Aug2011
+++ b/sql/ChangeLog.Aug2011
@@ -1,10 +1,6 @@
# ChangeLog file for sql
# This file is updated with Maddlog
-* Wed Nov 2 2011 Sjoerd Mullender <[email protected]>
-- Changed a bug where the sign() function returned the same type as its
- argument instead of always an INTEGER.
-
* Wed Oct 26 2011 Fabian Groffen <[email protected]>
- Added a fix for bug #2834, which caused weird (failing) behaviour
with PreparedStatements.
diff --git a/sql/common/sql_types.c b/sql/common/sql_types.c
--- a/sql/common/sql_types.c
+++ b/sql/common/sql_types.c
@@ -1327,7 +1327,7 @@ sqltypeinit(void)
sql_create_func("sql_neg", "calc", "-", *t, NULL, *t, INOUT);
sql_create_func("sql_pos", "calc", "+", *t, NULL, *t, INOUT);
sql_create_func("abs", "calc", "abs", *t, NULL, *t, SCALE_FIX);
- sql_create_func("sign", "calc", "sign", *t, NULL, INT,
SCALE_NONE);
+ sql_create_func("sign", "calc", "sign", *t, NULL, *t,
SCALE_FIX);
/* scale fixing for all numbers */
sql_create_func("scale_up", "calc", "*", *t, lt->type, *t,
SCALE_NONE);
sql_create_func("scale_down", "sql", "dec_round", *t, lt->type,
*t, SCALE_NONE);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
