Changeset: 12a1ca811ea1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=12a1ca811ea1
Modified Files:
clients/ChangeLog.Jul2012
monetdb5/extras/jaql/json.c
Branch: default
Log Message:
Merging
diffs (24 lines):
diff --git a/clients/ChangeLog.Jul2012 b/clients/ChangeLog.Jul2012
--- a/clients/ChangeLog.Jul2012
+++ b/clients/ChangeLog.Jul2012
@@ -2,6 +2,6 @@
# This file is updated with Maddlog
* Tue Jul 17 2012 Fabian Groffen <fab...@cwi.nl>
-- mclient no longer prints the SQLSTATE at the start each error returned
- by the SQL-server.
+- mclient no longer prints the SQLSTATE at the start of each error
+ returned by the SQL-server.
diff --git a/monetdb5/extras/jaql/json.c b/monetdb5/extras/jaql/json.c
--- a/monetdb5/extras/jaql/json.c
+++ b/monetdb5/extras/jaql/json.c
@@ -1462,7 +1462,7 @@ JSONunwrap(Client cntxt, MalBlkPtr mb, M
break;
case 'n':
default:
- d = 0.1 / 0.0;
+ d = 0.1 / (1.0
- 1.0);
BUNins(r, &v,
&d, FALSE);
break;
}
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
