Changeset: fe49019dd3b7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fe49019dd3b7
Modified Files:
configure.ag
sql/test/BugTracker-2013/Tests/select-around-zero.Bug-3220.sql
sql/test/BugTracker-2013/Tests/select-around-zero.Bug-3220.stable.out
Branch: default
Log Message:
Merge with Feb2013 branch.
diffs (187 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -947,7 +947,8 @@ if test "x$enable_optim" = xyes; then
# x86_64-*-*-10.*) CFLAGS="$CFLAGS -unroll
";;
# x86_64-*-*-10.*) CFLAGS="$CFLAGS
-axWPT ";;
- x86_64-*-*-11.*) CFLAGS="$CFLAGS -mp1 -O3 -restrict -unroll
-axSSE4.2 ";;
+ dnl We need to use -mp instead of -mp1 as otherwise nextafter() &
nextafterf() do not work correctly for 0
+ x86_64-*-*-11.*) CFLAGS="$CFLAGS -mp -O3 -restrict -unroll
-axSSE4.2 ";;
i*86-*-*-8.*) CFLAGS="$CFLAGS -mp1 -O3 -restrict -unroll
-tpp6 -axKWNPB";;
i*86-*-*-9.*) CFLAGS="$CFLAGS -mp1 -O3 -restrict -unroll
-tpp6 -axKWNPB";;
diff --git a/sql/test/BugTracker-2013/Tests/select-around-zero.Bug-3220.sql
b/sql/test/BugTracker-2013/Tests/select-around-zero.Bug-3220.sql
--- a/sql/test/BugTracker-2013/Tests/select-around-zero.Bug-3220.sql
+++ b/sql/test/BugTracker-2013/Tests/select-around-zero.Bug-3220.sql
@@ -1,5 +1,5 @@
start transaction;
-create table t3220 (y double, z float);
+create table t3220 (y double, z real);
insert into t3220 values (0,0);
insert into t3220 values (0.1,0.1);
insert into t3220 values (-0.1,-0.1);
diff --git
a/sql/test/BugTracker-2013/Tests/select-around-zero.Bug-3220.stable.out
b/sql/test/BugTracker-2013/Tests/select-around-zero.Bug-3220.stable.out
--- a/sql/test/BugTracker-2013/Tests/select-around-zero.Bug-3220.stable.out
+++ b/sql/test/BugTracker-2013/Tests/select-around-zero.Bug-3220.stable.out
@@ -26,7 +26,7 @@ Ready.
# 10:08:23 >
#start transaction;
-#create table t3220 (y double, z float);
+#create table t3220 (y double, z real);
#insert into t3220 values (0,0);
[ 1 ]
#insert into t3220 values (0.1,0.1);
@@ -40,99 +40,99 @@ Ready.
#select * from t3220;
% sys.t3220, sys.t3220 # table_name
% y, z # name
-% double, double # type
-% 24, 24 # length
+% double, real # type
+% 24, 15 # length
[ 0, 0 ]
-[ 0.1, 0.1 ]
-[ -0.1, -0.1 ]
-[ -0.2, -0.2 ]
-[ 0.2, 0.2 ]
+[ 0.1, 0.100000001 ]
+[ -0.1, -0.100000001 ]
+[ -0.2, -0.200000003 ]
+[ 0.2, 0.200000003 ]
#select * from t3220 where y = 0;
% sys.t3220, sys.t3220 # table_name
% y, z # name
-% double, double # type
-% 24, 24 # length
+% double, real # type
+% 24, 15 # length
[ 0, 0 ]
#select * from t3220 where z = 0;
% sys.t3220, sys.t3220 # table_name
% y, z # name
-% double, double # type
-% 24, 24 # length
+% double, real # type
+% 24, 15 # length
[ 0, 0 ]
#select * from t3220 where y < 0;
% sys.t3220, sys.t3220 # table_name
% y, z # name
-% double, double # type
-% 24, 24 # length
-[ -0.1, -0.1 ]
-[ -0.2, -0.2 ]
+% double, real # type
+% 24, 15 # length
+[ -0.1, -0.100000001 ]
+[ -0.2, -0.200000003 ]
#select * from t3220 where z < 0;
% sys.t3220, sys.t3220 # table_name
% y, z # name
-% double, double # type
-% 24, 24 # length
-[ -0.1, -0.1 ]
-[ -0.2, -0.2 ]
+% double, real # type
+% 24, 15 # length
+[ -0.1, -0.100000001 ]
+[ -0.2, -0.200000003 ]
#select * from t3220 where y > 0;
% sys.t3220, sys.t3220 # table_name
% y, z # name
-% double, double # type
-% 24, 24 # length
-[ 0.1, 0.1 ]
-[ 0.2, 0.2 ]
+% double, real # type
+% 24, 15 # length
+[ 0.1, 0.100000001 ]
+[ 0.2, 0.200000003 ]
#select * from t3220 where z > 0;
% sys.t3220, sys.t3220 # table_name
% y, z # name
-% double, double # type
-% 24, 24 # length
-[ 0.1, 0.1 ]
-[ 0.2, 0.2 ]
+% double, real # type
+% 24, 15 # length
+[ 0.1, 0.100000001 ]
+[ 0.2, 0.200000003 ]
#select * from t3220 where y <> 0;
% sys.t3220, sys.t3220 # table_name
% y, z # name
-% double, double # type
-% 24, 24 # length
-[ 0.1, 0.1 ]
-[ -0.1, -0.1 ]
-[ -0.2, -0.2 ]
-[ 0.2, 0.2 ]
+% double, real # type
+% 24, 15 # length
+[ 0.1, 0.100000001 ]
+[ -0.1, -0.100000001 ]
+[ -0.2, -0.200000003 ]
+[ 0.2, 0.200000003 ]
#select * from t3220 where z <> 0;
% sys.t3220, sys.t3220 # table_name
% y, z # name
-% double, double # type
-% 24, 24 # length
-[ 0.1, 0.1 ]
-[ -0.1, -0.1 ]
-[ -0.2, -0.2 ]
-[ 0.2, 0.2 ]
+% double, real # type
+% 24, 15 # length
+[ 0.1, 0.100000001 ]
+[ -0.1, -0.100000001 ]
+[ -0.2, -0.200000003 ]
+[ 0.2, 0.200000003 ]
#select * from t3220 where y > 0.1;
% sys.t3220, sys.t3220 # table_name
% y, z # name
-% double, double # type
-% 24, 24 # length
-[ 0.2, 0.2 ]
+% double, real # type
+% 24, 15 # length
+[ 0.2, 0.200000003 ]
#select * from t3220 where y < 0.1;
% sys.t3220, sys.t3220 # table_name
% y, z # name
-% double, double # type
-% 24, 24 # length
+% double, real # type
+% 24, 15 # length
[ 0, 0 ]
-[ -0.1, -0.1 ]
-[ -0.2, -0.2 ]
+[ -0.1, -0.100000001 ]
+[ -0.2, -0.200000003 ]
#select * from t3220 where y < -0.1;
% sys.t3220, sys.t3220 # table_name
% y, z # name
-% double, double # type
-% 24, 24 # length
-[ -0.2, -0.2 ]
+% double, real # type
+% 24, 15 # length
+[ -0.2, -0.200000003 ]
#select * from t3220 where y > -0.1;
% sys.t3220, sys.t3220 # table_name
% y, z # name
-% double, double # type
-% 24, 24 # length
+% double, real # type
+% 24, 15 # length
[ 0, 0 ]
-[ 0.1, 0.1 ]
-[ 0.2, 0.2 ]
+[ 0.1, 0.100000001 ]
+[ 0.2, 0.200000003 ]
#rollback;
# 10:08:24 >
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
