Changeset: d776af5d6849 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d776af5d6849
Modified Files:
clients/mapiclient/mclient.c
gdk/gdk_atoms.c
monetdb5/tests/gdkTests/Tests/casts.stable.out.Windows
monetdb5/tests/gdkTests/Tests/casts.stable.out.Windows.64bit.oid64
sql/test/testdb-upgrade-chain/Tests/dump.stable.out.Windows
sql/test/testdb-upgrade/Tests/dump.stable.out.Windows
sql/test/testdb/Tests/testdb-dump.stable.out.Windows
Branch: default
Log Message:
Merge with default
diffs (truncated from 1546 to 300 lines):
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -1050,11 +1050,20 @@ TESTrenderer(MapiHdl hdl)
} else if (strcmp(tp, "real") == 0) {
char buf[32];
int j;
+#ifdef HAVE_STRTOF
float v = strtof(s, NULL);
+#else
+ float v = (float) strtod(s, NULL);
+#endif
for (j = 4; j < 6; j++) {
snprintf(buf, sizeof(buf), "%.*g", j,
v);
+#ifdef HAVE_STRTOF
if (v == strtof(buf, NULL))
break;
+#else
+ if (v == (float) strtod(buf, NULL))
+ break;
+#endif
}
mnstr_printf(toConsole, "%s", buf);
} else
diff --git a/gdk/gdk_atoms.c b/gdk/gdk_atoms.c
--- a/gdk/gdk_atoms.c
+++ b/gdk/gdk_atoms.c
@@ -939,8 +939,13 @@ fltToStr(char **dst, int *len, const flt
}
for (i = 4; i < 10; i++) {
snprintf(*dst, *len, "%.*g", i, *src);
+#ifdef HAVE_STRTOF
if (strtof(*dst, NULL) == *src)
break;
+#else
+ if ((float) strtod(*dst, NULL) == *src)
+ break;
+#endif
}
return (int) strlen(*dst);
}
diff --git a/monetdb5/tests/gdkTests/Tests/casts.stable.out.Windows
b/monetdb5/tests/gdkTests/Tests/casts.stable.out.Windows
--- a/monetdb5/tests/gdkTests/Tests/casts.stable.out.Windows
+++ b/monetdb5/tests/gdkTests/Tests/casts.stable.out.Windows
@@ -816,9 +816,9 @@ exit SQLException:str;
io.printf("# io.print(32768:flt);\n");
io.print(32768:flt);
io.printf("# io.print(2147483647:flt);\n");
- io.print(2.14748365e+009:flt);
+ io.print(2.1474836e+009:flt);
io.printf("# io.print(-2147483647:flt);\n");
- io.print(-2.14748365e+009:flt);
+ io.print(-2.1474836e+009:flt);
io.printf("# fl:= 2147483647+1;\n");
fl := calc.+(2147483647,1);
catch MALException:str;
@@ -861,25 +861,25 @@ exit MALException:str;
io.printf("# io.print(1LL:flt);\n");
io.print(1:flt);
io.printf("# io.print(2147483647LL:flt);\n");
- io.print(2.14748365e+009:flt);
+ io.print(2.1474836e+009:flt);
io.printf("# io.print(2147483648LL:flt);\n");
- io.print(2.14748365e+009:flt);
+ io.print(2.1474836e+009:flt);
io.printf("# io.print(2147483649LL:flt);\n");
- io.print(2.14748365e+009:flt);
+ io.print(2.1474836e+009:flt);
io.printf("# io.print(-2147483647LL:flt);\n");
- io.print(-2.14748365e+009:flt);
+ io.print(-2.1474836e+009:flt);
io.printf("# io.print(-2147483648LL:flt);\n");
- io.print(-2.14748365e+009:flt);
+ io.print(-2.1474836e+009:flt);
io.printf("# io.print(-2147483649LL:flt);\n");
- io.print(-2.14748365e+009:flt);
+ io.print(-2.1474836e+009:flt);
io.printf("# io.print(9223372036854775807LL:flt);\n");
- io.print(9.22337204e+018:flt);
+ io.print(9.223372e+018:flt);
io.printf("# io.print(9223372036854775808LL:flt);\n");
io.print(nil:flt);
io.printf("# io.print(9223372036854775809LL:flt);\n");
io.print(nil:flt);
io.printf("# io.print(-9223372036854775807LL:flt);\n");
- io.print(-9.22337204e+018:flt);
+ io.print(-9.223372e+018:flt);
io.printf("# io.print(-9223372036854775808LL:flt);\n");
io.print(nil:flt);
io.printf("# io.print(-9223372036854775809LL:flt);\n");
@@ -888,40 +888,40 @@ exit MALException:str;
io.printf("# io.print(0.0LL:flt);\n");
io.print(0:flt);
io.printf("# io.print(0.1LL:flt);\n");
- io.print(0.100000001:flt);
+ io.print(0.1:flt);
io.printf("# io.print(0.5LL:flt);\n");
io.print(0.5:flt);
io.printf("# io.print(0.9LL:flt);\n");
- io.print(0.899999976:flt);
+ io.print(0.9:flt);
io.printf("# io.print(1.0LL:flt);\n");
io.print(1:flt);
io.printf("# io.print(-0.1LL:flt);\n");
- io.print(-0.100000001:flt);
+ io.print(-0.1:flt);
io.printf("# io.print(-0.5LL:flt);\n");
io.print(-0.5:flt);
io.printf("# io.print(-0.9LL:flt);\n");
- io.print(-0.899999976:flt);
+ io.print(-0.9:flt);
io.printf("# io.print(-1.0LL:flt);\n");
io.print(-1:flt);
io.printf("# io.print(2147483647.0LL:flt);\n");
- io.print(2.14748365e+009:flt);
+ io.print(2.1474836e+009:flt);
io.printf("# io.print(2147483648.0LL:flt);\n");
- io.print(2.14748365e+009:flt);
+ io.print(2.1474836e+009:flt);
io.printf("# io.print(2147483649.0LL:flt);\n");
- io.print(2.14748365e+009:flt);
+ io.print(2.1474836e+009:flt);
io.printf("# io.print(-2147483647.0LL:flt);\n");
- io.print(-2.14748365e+009:flt);
+ io.print(-2.1474836e+009:flt);
io.printf("# io.print(-2147483648.0LL:flt);\n");
- io.print(-2.14748365e+009:flt);
+ io.print(-2.1474836e+009:flt);
io.printf("# io.print(-2147483649.0LL:flt);\n");
- io.print(-2.14748365e+009:flt);
+ io.print(-2.1474836e+009:flt);
io.printf("# flt from oid\n");
io.printf("# io.print(2@0:flt);\n");
io.print(2:flt);
io.printf("# io.print(2@1:flt);\n");
io.print(2:flt);
io.printf("# io.print(2147483647@0:flt);\n");
- io.print(2.14748365e+009:flt);
+ io.print(2.1474836e+009:flt);
io.printf("# io.print(2147483648@0:flt);\n");
io.print(nil:flt);
io.printf("# io.print(2147483649@0:flt);\n");
@@ -1394,13 +1394,13 @@ exit MALException:str;
io.printf("# io.print(-2147483649LL:dbl);\n");
io.print(-2147483649:dbl);
io.printf("# io.print(9223372036854775807LL:dbl);\n");
- io.print(9.2233720368547758e+018:dbl);
+ io.print(9.223372036854776e+018:dbl);
io.printf("# io.print(9223372036854775808LL:dbl);\n");
io.print(nil:dbl);
io.printf("# io.print(9223372036854775809LL:dbl);\n");
io.print(nil:dbl);
io.printf("# io.print(-9223372036854775807LL:dbl);\n");
- io.print(-9.2233720368547758e+018:dbl);
+ io.print(-9.223372036854776e+018:dbl);
io.printf("# io.print(-9223372036854775808LL:dbl);\n");
io.print(nil:dbl);
io.printf("# io.print(-9223372036854775809LL:dbl);\n");
@@ -1990,7 +1990,7 @@ exit MALException:str;
io.printf("# io.print(-1.0:oid);\n");
io.print(nil:oid);
io.printf("# io.print(2147483647.0:oid);\n");
- io.print(nil:oid);
+ io.print(2147483647@0:oid);
io.printf("# io.print(2147483648.0:oid);\n");
io.print(nil:oid);
io.printf("# io.print(2147483649.0:oid);\n");
@@ -2180,50 +2180,50 @@ exit MALException:str;
io.printf("# io.print(0.0:str);\n");
io.print("0":str);
io.printf("# io.print(0.1:str);\n");
- io.print("0.100000001":str);
+ io.print("0.1":str);
io.printf("# io.print(0.5:str);\n");
io.print("0.5":str);
io.printf("# io.print(0.9:str);\n");
- io.print("0.899999976":str);
+ io.print("0.9":str);
io.printf("# io.print(1.0:str);\n");
io.print("1":str);
io.printf("# io.print(-0.1:str);\n");
- io.print("-0.100000001":str);
+ io.print("-0.1":str);
io.printf("# io.print(-0.5:str);\n");
io.print("-0.5":str);
io.printf("# io.print(-0.9:str);\n");
- io.print("-0.899999976":str);
+ io.print("-0.9":str);
io.printf("# io.print(-1.0:str);\n");
io.print("-1":str);
io.printf("# io.print(2147483647.0:str);\n");
- io.print("2.14748365e+009":str);
+ io.print("2147483647":str);
io.printf("# io.print(2147483648.0:str);\n");
- io.print("2.14748365e+009":str);
+ io.print("2147483648":str);
io.printf("# io.print(2147483649.0:str);\n");
- io.print("2.14748365e+009":str);
+ io.print("2147483649":str);
io.printf("# io.print(-2147483647.0:str);\n");
- io.print("-2.14748365e+009":str);
+ io.print("-2147483647":str);
io.printf("# io.print(-2147483648.0:str);\n");
- io.print("-2.14748365e+009":str);
+ io.print("-2147483648":str);
io.printf("# io.print(-2147483649.0:str);\n");
- io.print("-2.14748365e+009":str);
+ io.print("-2147483649":str);
io.printf("# str from dbl\n");
io.printf("# io.print(0.0LL:str);\n");
io.print("0":str);
io.printf("# io.print(0.1LL:str);\n");
- io.print("0.10000000000000001":str);
+ io.print("0.1":str);
io.printf("# io.print(0.5LL:str);\n");
io.print("0.5":str);
io.printf("# io.print(0.9LL:str);\n");
- io.print("0.90000000000000002":str);
+ io.print("0.9":str);
io.printf("# io.print(1.0LL:str);\n");
io.print("1":str);
io.printf("# io.print(-0.1LL:str);\n");
- io.print("-0.10000000000000001":str);
+ io.print("-0.1":str);
io.printf("# io.print(-0.5LL:str);\n");
io.print("-0.5":str);
io.printf("# io.print(-0.9LL:str);\n");
- io.print("-0.90000000000000002":str);
+ io.print("-0.9":str);
io.printf("# io.print(-1.0LL:str);\n");
io.print("-1":str);
io.printf("# io.print(2147483647.0LL:str);\n");
@@ -2897,9 +2897,9 @@ Caught exception
# io.print(32768:flt);
[ 32768 ]
# io.print(2147483647:flt);
-[ 2.14748365e+009 ]
+[ 2.1474836e+009 ]
# io.print(-2147483647:flt);
-[ -2.14748365e+009 ]
+[ -2.1474836e+009 ]
# fl:= 2147483647+1;
Caught exception
# f:= calc.flt(fl);
@@ -2926,25 +2926,25 @@ Caught exception
# io.print(1LL:flt);
[ 1 ]
# io.print(2147483647LL:flt);
-[ 2.14748365e+009 ]
+[ 2.1474836e+009 ]
# io.print(2147483648LL:flt);
-[ 2.14748365e+009 ]
+[ 2.1474836e+009 ]
# io.print(2147483649LL:flt);
-[ 2.14748365e+009 ]
+[ 2.1474836e+009 ]
# io.print(-2147483647LL:flt);
-[ -2.14748365e+009 ]
+[ -2.1474836e+009 ]
# io.print(-2147483648LL:flt);
-[ -2.14748365e+009 ]
+[ -2.1474836e+009 ]
# io.print(-2147483649LL:flt);
-[ -2.14748365e+009 ]
+[ -2.1474836e+009 ]
# io.print(9223372036854775807LL:flt);
-[ 9.22337204e+018 ]
+[ 9.223372e+018 ]
# io.print(9223372036854775808LL:flt);
[ nil ]
# io.print(9223372036854775809LL:flt);
[ nil ]
# io.print(-9223372036854775807LL:flt);
-[ -9.22337204e+018 ]
+[ -9.223372e+018 ]
# io.print(-9223372036854775808LL:flt);
[ nil ]
# io.print(-9223372036854775809LL:flt);
@@ -2953,40 +2953,40 @@ Caught exception
# io.print(0.0LL:flt);
[ 0 ]
# io.print(0.1LL:flt);
-[ 0.100000001 ]
+[ 0.1 ]
# io.print(0.5LL:flt);
[ 0.5 ]
# io.print(0.9LL:flt);
-[ 0.899999976 ]
+[ 0.9 ]
# io.print(1.0LL:flt);
[ 1 ]
# io.print(-0.1LL:flt);
-[ -0.100000001 ]
+[ -0.1 ]
# io.print(-0.5LL:flt);
[ -0.5 ]
# io.print(-0.9LL:flt);
-[ -0.899999976 ]
+[ -0.9 ]
# io.print(-1.0LL:flt);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
