Changeset: cb8a3f6efb36 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cb8a3f6efb36 Modified Files: monetdb5/tests/gdkTests/Tests/casts.stable.out.SunOS5.10 monetdb5/tests/gdkTests/Tests/casts.stable.out.SunOS5.10.oid64 sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.py Branch: default Log Message:
Merge with Apr2012 branch. diffs (truncated from 3759 to 300 lines): diff --git a/monetdb5/tests/gdkTests/Tests/casts.stable.out.SunOS5.10 b/monetdb5/tests/gdkTests/Tests/casts.stable.out.SunOS5.10 --- a/monetdb5/tests/gdkTests/Tests/casts.stable.out.SunOS5.10 +++ b/monetdb5/tests/gdkTests/Tests/casts.stable.out.SunOS5.10 @@ -393,9 +393,9 @@ exit SQLException:str ; io.print(-2147483648:lng); io.print(-2147483648:lng); io.print(-2147483648:lng); - io.print(nil:lng); - io.print(nil:lng); - io.print(nil:lng); + io.print(9223372036854775807:lng); + io.print(9223372036854775807:lng); + io.print(9223372036854775807:lng); io.print(nil:lng); io.print(nil:lng); io.print(nil:lng); @@ -415,9 +415,9 @@ exit SQLException:str ; io.print(-2147483647:lng); io.print(-2147483648:lng); io.print(-2147483649:lng); - io.print(nil:lng); - io.print(nil:lng); - io.print(nil:lng); + io.print(9223372036854775807:lng); + io.print(9223372036854775807:lng); + io.print(9223372036854775807:lng); io.print(nil:lng); io.print(nil:lng); io.print(nil:lng); @@ -425,9 +425,9 @@ exit SQLException:str ; io.print(2:lng); io.print(2:lng); io.print(2147483647:lng); - io.print(2147483648:lng); - io.print(2147483649:lng); - io.print(9223372036854775807:lng); + io.print(nil:lng); + io.print(nil:lng); + io.print(nil:lng); io.print(nil:lng); io.print(nil:lng); io.printf("# lng from str\n"); @@ -562,8 +562,8 @@ exit SQLException:str ; io.print(2:flt); io.print(2:flt); io.print(2.14748365e+09:flt); - io.print(2.14748365e+09:flt); - io.print(2.14748365e+09:flt); + io.print(nil:flt); + io.print(nil:flt); io.printf("# flt from str\n"); s := "0"; s_flt := calc.flt(s); @@ -924,8 +924,8 @@ exit SQLException:str ; io.print(2:dbl); io.print(2:dbl); io.print(2147483647:dbl); - io.print(2147483648:dbl); - io.print(2147483649:dbl); + io.print(nil:dbl); + io.print(nil:dbl); io.printf("# dbl from str\n"); s := "0"; s_dbl := calc.dbl(s); @@ -1291,11 +1291,11 @@ exit SQLException:str ; ol3 := 2147483647:lng; o := calc.oid(ol3); io.print(o); - io.print(2147483648@0:oid); + io.print(nil:oid); ol3 := 2147483648:lng; o := calc.oid(ol3); io.print(o); - io.print(2147483649@0:oid); + io.print(nil:oid); ol3 := 2147483649:lng; o := calc.oid(ol3); io.print(o); @@ -1312,9 +1312,9 @@ exit SQLException:str ; io.print(nil:oid); io.print(nil:oid); io.print(nil:oid); - io.print(2147483648@0:oid); - io.print(2147483648@0:oid); - io.print(2147483648@0:oid); + io.print(nil:oid); + io.print(nil:oid); + io.print(nil:oid); io.print(nil:oid); io.print(nil:oid); io.print(nil:oid); @@ -1329,8 +1329,8 @@ exit SQLException:str ; io.print(nil:oid); io.print(nil:oid); io.print(2147483647@0:oid); - io.print(2147483648@0:oid); - io.print(2147483649@0:oid); + io.print(nil:oid); + io.print(nil:oid); io.print(nil:oid); io.print(nil:oid); io.print(nil:oid); @@ -1338,8 +1338,8 @@ exit SQLException:str ; io.print(2@0:oid); io.print(2@0:oid); io.print(2147483647@0:oid); - io.print(2147483648@0:oid); - io.print(2147483649@0:oid); + io.print(nil:oid); + io.print(nil:oid); io.printf("# oid from str\n"); s := "0"; s_oid := calc.oid(s); @@ -1467,8 +1467,8 @@ exit SQLException:str ; io.print("2@0":str); io.print("2@0":str); io.print("2147483647@0":str); - io.print("2147483648@0":str); - io.print("2147483649@0":str); + io.print(nil:str); + io.print(nil:str); io.printf("# str from str\n"); s := "0"; s_str := calc.str(s); @@ -1757,9 +1757,9 @@ Caught exception [ -2147483648 ] [ -2147483648 ] [ -2147483648 ] -[ nil ] -[ nil ] -[ nil ] +[ 9223372036854775807 ] +[ 9223372036854775807 ] +[ 9223372036854775807 ] [ nil ] [ nil ] [ nil ] @@ -1779,9 +1779,9 @@ Caught exception [ -2147483647 ] [ -2147483648 ] [ -2147483649 ] -[ nil ] -[ nil ] -[ nil ] +[ 9223372036854775807 ] +[ 9223372036854775807 ] +[ 9223372036854775807 ] [ nil ] [ nil ] [ nil ] @@ -1789,9 +1789,9 @@ Caught exception [ 2 ] [ 2 ] [ 2147483647 ] -[ 2147483648 ] -[ 2147483649 ] -[ 9223372036854775807 ] +[ nil ] +[ nil ] +[ nil ] [ nil ] [ nil ] # lng from str @@ -1864,8 +1864,8 @@ Caught exception [ 2 ] [ 2 ] [ 2.14748365e+09 ] -[ 2.14748365e+09 ] -[ 2.14748365e+09 ] +[ nil ] +[ nil ] # flt from str [ 0 ] [ 32767 ] @@ -2012,8 +2012,8 @@ Caught exception [ 2 ] [ 2 ] [ 2147483647 ] -[ 2147483648 ] -[ 2147483649 ] +[ nil ] +[ nil ] # dbl from str [ 0 ] [ 32767 ] @@ -2139,10 +2139,10 @@ Caught exception [ 1@0 ] [ 2147483647@0 ] [ 2147483647@0 ] -[ 2147483648@0 ] -[ 2147483648@0 ] -[ 2147483649@0 ] -[ 2147483649@0 ] +[ nil ] +[ nil ] +[ nil ] +[ nil ] [ nil ] [ nil ] [ nil ] @@ -2156,9 +2156,9 @@ Caught exception [ nil ] [ nil ] [ nil ] -[ 2147483648@0 ] -[ 2147483648@0 ] -[ 2147483648@0 ] +[ nil ] +[ nil ] +[ nil ] [ nil ] [ nil ] [ nil ] @@ -2173,8 +2173,8 @@ Caught exception [ nil ] [ nil ] [ 2147483647@0 ] -[ 2147483648@0 ] -[ 2147483649@0 ] +[ nil ] +[ nil ] [ nil ] [ nil ] [ nil ] @@ -2182,14 +2182,14 @@ Caught exception [ 2@0 ] [ 2@0 ] [ 2147483647@0 ] -[ 2147483648@0 ] -[ 2147483649@0 ] +[ nil ] +[ nil ] # oid from str [ 0@0 ] [ 32767@0 ] [ 2147483647@0 ] -[ 2147483648@0 ] -[ 2147483649@0 ] +[ nil ] +[ nil ] [ nil ] [ nil ] [ nil ] @@ -2258,8 +2258,8 @@ Caught exception [ "2@0" ] [ "2@0" ] [ "2147483647@0" ] -[ "2147483648@0" ] -[ "2147483649@0" ] +[ nil ] +[ nil ] # str from str [ "0" ] [ "32767" ] @@ -2272,1709 +2272,7 @@ Caught exception [ "" ] [ "random string" ] -# 17:01:43 > -# 17:01:43 > "Done." -# 17:01:43 > +# 11:13:01 > +# 11:13:01 > "Done." +# 11:13:01 > -stdout of test 'casts` in directory 'tests/gdkTests` itself: - - -# 23:39:53 > -# 23:39:53 > Mtimeout -timeout 60 mserver5 "--config=/ufs/mk/monet5/Linux/etc/MonetDB5.conf" --debug=10 --set "monet_mod_path=/ufs/mk/monet5/Linux/lib/MonetDB5:/ufs/mk/opensource/MonetDB/Linux/lib/MonetDB" --set "gdk_dbfarm=/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/mk/monet5/Linux/var/MonetDB5/dblogs" --set mapi_port=38963 --set monet_prompt= --trace --dbname=mTests_tests_gdkTests casts.mal < /dev/null -# 23:39:53 > - -# MonetDB Server v4.99.19 -# Copyright (c) 1993-2006 CWI, all rights reserved -# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs dynamically linked -# config:/ufs/mk/monet5/Linux/etc/MonetDB5.conf -# dbfarm:/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm -# dbname:mTests_tests_gdkTests -# Visit http://monetdb.cwi.nl/ for further information -# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:30579/ -function user.main():void; - io.printf("# casting to int\n"); - io.print(0:int); - io.print(1:int); - io.print(32767); - io.print(32768); - io.print(32769); - io.print(2147483647); - io.print(2147483648:lng); - io.print(2147483649:lng); - io.print(-2147483647:int); - io.print(-2147483648:lng); - io.print(-2147483649:lng); - io.printf("# int from bit\n"); - bi := 1:int; - io.print(bi); - bi := 0:int; - io.print(bi); - io.printf("# int from sht\n"); - sh := 1:sht; _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list