Changeset: b3300dcc8714 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b3300dcc8714
Added Files:
        sql/test/BugTracker-2012/Tests/float-mod.Bug-3086.sql
        sql/test/BugTracker-2012/Tests/float-mod.Bug-3086.stable.err
        sql/test/BugTracker-2012/Tests/float-mod.Bug-3086.stable.out
Modified Files:
        sql/common/sql_types.c
        sql/test/BugTracker-2012/Tests/All
Branch: Jul2012
Log Message:

Merge with Apr2012 branch.


diffs (147 lines):

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
@@ -1272,7 +1272,7 @@ sqltypeinit( sql_allocator *sa)
        for (t = floats; t < dates; t++) {
                sql_create_aggr(sa, "sum", "aggr", "sum", *t, *t);
                sql_create_aggr(sa, "prod", "aggr", "product", *t, *t);
-               sql_create_func(sa, "mod", "calc", "fmod", *t, *t, *t, 
SCALE_FIX);
+               sql_create_func(sa, "mod", "mmath", "fmod", *t, *t, *t, 
SCALE_FIX);
        }
        /*
        sql_create_aggr(sa, "avg", "aggr", "avg", BTE, DBL);
diff --git a/sql/test/BugTracker-2012/Tests/All 
b/sql/test/BugTracker-2012/Tests/All
--- a/sql/test/BugTracker-2012/Tests/All
+++ b/sql/test/BugTracker-2012/Tests/All
@@ -38,3 +38,4 @@ mal_syntax_error.Bug-2949
 grant_on_qname.Bug-2958
 bug_large-insert-Bug.2960
 any_null.Bug-2594
+float-mod.Bug-3086
diff --git a/sql/test/BugTracker-2012/Tests/float-mod.Bug-3086.sql 
b/sql/test/BugTracker-2012/Tests/float-mod.Bug-3086.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/float-mod.Bug-3086.sql
@@ -0,0 +1,6 @@
+start transaction;
+create table t3086 (d double);
+insert into t3086 values (0.011);
+select mod(0.011 + 180, 360);
+select mod(d + 180, 360) from t3086;
+rollback;
diff --git a/sql/test/BugTracker-2012/Tests/float-mod.Bug-3086.stable.err 
b/sql/test/BugTracker-2012/Tests/float-mod.Bug-3086.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/float-mod.Bug-3086.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'float-mod.Bug-3086` in directory 'test/BugTracker-2012` itself:
+
+
+# 16:38:41 >  
+# 16:38:41 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"gdk_dbfarm=/ufs/sjoerd/Monet-stable/var/MonetDB" "--set" "mapi_open=true" 
"--set" "mapi_port=35880" "--set" "monet_prompt=" "--trace" "--forcemito" 
"--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2012" "--set" 
"mal_listing=0"
+# 16:38:41 >  
+
+# builtin opt  gdk_dbname = demo
+# builtin opt  gdk_dbfarm = /ufs/sjoerd/Monet-stable/var/monetdb5/dbfarm
+# builtin opt  gdk_debug = 0
+# builtin opt  gdk_alloc_map = no
+# builtin opt  gdk_vmtrim = yes
+# builtin opt  monet_prompt = >
+# builtin opt  monet_daemon = no
+# builtin opt  mapi_port = 50000
+# builtin opt  mapi_open = false
+# builtin opt  mapi_autosense = false
+# builtin opt  sql_optimizer = default_pipe
+# builtin opt  sql_debug = 0
+# cmdline opt  gdk_nr_threads = 0
+# cmdline opt  gdk_dbfarm = /ufs/sjoerd/Monet-stable/var/MonetDB
+# cmdline opt  mapi_open = true
+# cmdline opt  mapi_port = 35880
+# cmdline opt  monet_prompt = 
+# cmdline opt  mal_listing = 2
+# cmdline opt  gdk_dbname = mTests_test_BugTracker-2012
+# cmdline opt  mal_listing = 0
+
+# 16:38:42 >  
+# 16:38:42 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=madrid" 
"--port=35880"
+# 16:38:42 >  
+
+
+# 16:38:42 >  
+# 16:38:42 >  "Done."
+# 16:38:42 >  
+
diff --git a/sql/test/BugTracker-2012/Tests/float-mod.Bug-3086.stable.out 
b/sql/test/BugTracker-2012/Tests/float-mod.Bug-3086.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/float-mod.Bug-3086.stable.out
@@ -0,0 +1,69 @@
+stdout of test 'float-mod.Bug-3086` in directory 'test/BugTracker-2012` itself:
+
+
+# 16:38:41 >  
+# 16:38:41 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"gdk_dbfarm=/ufs/sjoerd/Monet-stable/var/MonetDB" "--set" "mapi_open=true" 
"--set" "mapi_port=35880" "--set" "monet_prompt=" "--trace" "--forcemito" 
"--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2012" "--set" 
"mal_listing=0"
+# 16:38:41 >  
+
+# MonetDB 5 server v11.9.6 (hg id: 2b43985d0e82)
+# This is an unreleased version
+# Serving database 'mTests_test_BugTracker-2012', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically 
linked
+# Found 15.629 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2012 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://madrid.ins.cwi.nl:35880/
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+# SQL catalog created, loading sql scripts once
+# loading sql script: 09_like.sql
+# loading sql script: 10_math.sql
+# loading sql script: 11_times.sql
+# loading sql script: 12_url.sql
+# loading sql script: 13_date.sql
+# loading sql script: 14_inet.sql
+# loading sql script: 15_history.sql
+# loading sql script: 16_tracelog.sql
+# loading sql script: 17_compress.sql
+# loading sql script: 18_dictionary.sql
+# loading sql script: 19_cluster.sql
+# loading sql script: 20_vacuum.sql
+# loading sql script: 21_dependency_functions.sql
+# loading sql script: 22_clients.sql
+# loading sql script: 23_skyserver.sql
+# loading sql script: 24_zorder.sql
+# loading sql script: 25_debug.sql
+# loading sql script: 39_analytics.sql
+# loading sql script: 40_geom.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 99_system.sql
+
+# 16:38:42 >  
+# 16:38:42 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=madrid" 
"--port=35880"
+# 16:38:42 >  
+
+#start transaction;
+#create table t3086 (d double);
+#insert into t3086 values (0.011);
+[ 1    ]
+#select mod(0.011 + 180, 360);
+% . # table_name
+% sql_add_single_value # name
+% decimal # type
+% 11 # length
+[ 180.011      ]
+#select mod(d + 180, 360) from t3086;
+% sys. # table_name
+% mod_sql_add_d # name
+% double # type
+% 24 # length
+[ 180.011      ]
+#rollback;
+
+# 16:38:42 >  
+# 16:38:42 >  "Done."
+# 16:38:42 >  
+
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to