Changeset: b5cfac9654aa for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b5cfac9654aa Modified Files: sql/src/test/Tests/load_dec_as_int.sql.src sql/src/test/Tests/load_dec_as_int.stable.err sql/src/test/Tests/load_dec_as_int.stable.out Branch: default Log Message:
merge diffs (76 lines): diff -r 4c0805a1e381 -r b5cfac9654aa sql/src/test/Tests/All --- a/sql/src/test/Tests/All Sat Dec 04 00:29:07 2010 +0100 +++ b/sql/src/test/Tests/All Sat Dec 04 00:29:36 2010 +0100 @@ -84,7 +84,6 @@ order_by_complex_exp setoptimizer -load_dec_as_int string NOT_WIN32?crashme 50ways diff -r 4c0805a1e381 -r b5cfac9654aa sql/src/test/Tests/load_dec_as_int.sql.src --- a/sql/src/test/Tests/load_dec_as_int.sql.src Sat Dec 04 00:29:07 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -$RELSRCDIR/../load_dec_as_int.sql diff -r 4c0805a1e381 -r b5cfac9654aa sql/src/test/Tests/load_dec_as_int.stable.err --- a/sql/src/test/Tests/load_dec_as_int.stable.err Sat Dec 04 00:29:07 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ -stderr of test 'load_dec_as_int` in directory 'src/test` itself: - - -# 19:16:14 > -# 19:16:14 > Mserver "--config=/ufs/niels/scratch/monetdb/Linux-x86_64/etc/MonetDB.conf" --debug=10 --set "monet_mod_path=/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB4:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB4/lib:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB4/bin" --set "gdk_dbfarm=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB4/dbfarm" --set "sql_logdir=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB4/sql_logs" --set "xquery_logdir=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB4/xquery_logs" --set mapi_open=true --set xrpc_open=true --set mapi_port=36200 --set xrpc_port=45754 --set monet_prompt= --trace "--dbname=mTests_src_test" "--dbinit= module(sql_server);" ; echo ; echo Over.. -# 19:16:14 > - - -# 19:16:14 > -# 19:16:14 > mclient -lsql -umonetdb -Pmonetdb --host=koala --port=36200 -# 19:16:14 > - - -# 19:16:14 > -# 19:16:14 > Done. -# 19:16:14 > - diff -r 4c0805a1e381 -r b5cfac9654aa sql/src/test/Tests/load_dec_as_int.stable.out --- a/sql/src/test/Tests/load_dec_as_int.stable.out Sat Dec 04 00:29:07 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,35 +0,0 @@ -stdout of test 'load_dec_as_int` in directory 'src/test` itself: - - -# 19:16:14 > -# 19:16:14 > Mserver "--config=/ufs/niels/scratch/monetdb/Linux-x86_64/etc/MonetDB.conf" --debug=10 --set "monet_mod_path=/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB4:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB4/lib:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB4/bin" --set "gdk_dbfarm=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB4/dbfarm" --set "sql_logdir=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB4/sql_logs" --set "xquery_logdir=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB4/xquery_logs" --set mapi_open=true --set xrpc_open=true --set mapi_port=36200 --set xrpc_port=45754 --set monet_prompt= --trace "--dbname=mTests_src_test" "--dbinit= module(sql_server);" ; echo ; echo Over.. -# 19:16:14 > - -# MonetDB Server v4.21.0 -# based on GDK v1.21.0 -# Copyright (c) 1993-2007, CWI. All rights reserved. -# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs; dynamically linked. -# Visit http://monetdb.cwi.nl/ for further information. -# MonetDB/SQL module v2.21.0 loaded - - -Ready. - -Over.. - -# 19:16:14 > -# 19:16:14 > mclient -lsql -umonetdb -Pmonetdb --host=koala --port=36200 -# 19:16:14 > - -[ 2 ] -% sys.my_test, sys.my_test, sys.my_test, sys.my_test, sys.my_test # table_name -% col1, col2, col3, col4, col5 # name -% int, int, int, varchar, varchar # type -% 3, 1, 1, 3, 3 # length -[ 123, 0, NULL, "aaa", "bbb" ] -[ 123, 0, NULL, "aaa", "bbb" ] - -# 19:16:14 > -# 19:16:14 > Done. -# 19:16:14 > - _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
