Changeset: 355c683ac9bb for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=355c683ac9bb Removed Files: sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.stable.out.Darwin.src sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.stable.out.Windows Modified Files: sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.SunOS Branch: default Log Message:
Merge from Feb2013 branch. diffs (75 lines): diff --git a/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.SunOS b/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.SunOS --- a/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.SunOS +++ b/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.SunOS @@ -68,9 +68,6 @@ stderr of test 'overflow.SF-2853458` in # 22:26:13 > MAPI = (monetdb) /var/tmp/mtest-13966/.s.monetdb.38628 -QUERY = select cast(power(2,63) as bigint); -ERROR = !overflow in conversion of 9.22337204e+18 to lng. -MAPI = (monetdb) /var/tmp/mtest-13966/.s.monetdb.38628 QUERY = select cast(power(2,64) as bigint); ERROR = !overflow in conversion of 1.84467441e+19 to lng. diff --git a/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.stable.out.Darwin.src b/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.stable.out.Darwin.src deleted file mode 100644 --- a/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.stable.out.Darwin.src +++ /dev/null @@ -1,1 +0,0 @@ -unicode_varchar-bug-sf-1041324_JdbcClient.stable.out.Windows diff --git a/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.stable.out.Windows b/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.stable.out.Windows deleted file mode 100644 --- a/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.stable.out.Windows +++ /dev/null @@ -1,51 +0,0 @@ -stdout of test 'unicode_varchar-bug-sf-1041324_JdbcClient` in directory 'test/bugs` itself: - - -# 15:12:10 > -# 15:12:10 > Mtimeout -timeout 300 mserver5 "--config=/ufs/fabian/scratch/monetdb/current/program-x86_64/etc/monetdb5.conf" --debug=10 --set "monet_mod_path=/ufs/fabian/scratch/monetdb/current/program-x86_64/lib64/MonetDB5:/ufs/fabian/scratch/monetdb/current/program-x86_64/lib64/MonetDB5/lib:/ufs/fabian/scratch/monetdb/current/program-x86_64/lib64/MonetDB5/bin" --set "gdk_dbfarm=/net/pegasus.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-current-pegasus.ins.cwi.nl/sql/dbfarm" --set "sql_logdir=/net/pegasus.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-current-pegasus.ins.cwi.nl/sql/sqllog" --set "xquery_logdir=/net/pegasus.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-current-pegasus.ins.cwi.nl/sql/xquerylog" --set mapi_open=true --set mapi_port=30451 --set xrpc_port=40862 --set monet_prompt= --trace "--dbname=mTests_src_test_bugs" --dbinit=' include sql;' ; echo ; echo Over.. -# 15:12:10 > - - - -# MonetDB server v5.1.0, based on kernel v1.19.0 -# Serving database 'mTests_src_test_bugs' -# Compiled for x86_64-pc-linux-gnu/64bit with 64bit OIDs dynamically linked -# Copyright (c) 1993-2007 CWI, all rights reserved -# Visit http://monetdb.cwi.nl/ for further information -# Listening for connection requests on mapi:monetdb://pegasus.ins.cwi.nl:30451/ -# MonetDB/SQL module v2.19.0 loaded - -Ready. -#function user.main():void; -# clients.quit(); -#end main; - - -# 12:55:12 > -# 12:55:12 > Mtimeout -timeout 180 ./unicode_varchar-bug-sf-1041324_JdbcClient.SQL unicode_varchar-bug-sf-1041324_JdbcClient -# 12:55:12 > - - -# 12:55:12 > -# 12:55:12 > Mtimeout -timeout 60 java -jar /net/pegasus.ins.cwi.nl/export/scratch1/fabian/monetdb/current/build-pegasus.ins.cwi.nl/sql/src/jdbc/jdbcclient-1.2.jar -h localhost -p 45579 -f ../../../../../../../../../net/pegasus.ins.cwi.nl/export/scratch1/fabian/monetdb/current/sql/src/test/bugs/Tests/../bug-sf-1041324_weird-char.sql -# 12:55:12 > - -+-------------------------------------------------------------------------------------------------------------------------------------+ -| single_value | -+=====================================================================================================================================+ -| http://shopping.b92.net/index.php?IDS=11&ID_Group=39&ID_prod=754&PROD_NAME=Belgrade+Coffee+Shop+4&GROUP_NAME=Muzi�a+produkcija | -+-------------------------------------------------------------------------------------------------------------------------------------+ -1 row - -+--------------------------+ -| single_value | -+==========================+ -| SAVE 25¢ ON ICE CREAM | -+--------------------------+ -1 row - - -# 12:55:12 > -# 12:55:12 > Done. -# 12:55:12 > - _______________________________________________ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
