Changeset: 6899bc504af6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6899bc504af6
Modified Files:
Branch: gdk-calc
Log Message:
Merge with default branch.
diffs (truncated from 482 to 300 lines):
diff --git a/clients/odbc/winsetup/setup.rc b/clients/odbc/winsetup/setup.rc
--- a/clients/odbc/winsetup/setup.rc
+++ b/clients/odbc/winsetup/setup.rc
@@ -82,7 +82,7 @@ BEGIN
VALUE "FileDescription", "MonetDB ODBC Setup DLL"
VALUE "FileVersion", "11.8.0"
VALUE "InternalName", "libMonetODBCs.dll"
- VALUE "LegalCopyright", "Copyright (c) MonetDB BV 2008-2011"
+ VALUE "LegalCopyright", "Copyright (c) MonetDB BV 2008-2012"
VALUE "OriginalFilename", "libMonetODBCs.dll"
VALUE "ProductName", "MonetDB SQL Server"
VALUE "ProductVersion", "11.8.0"
diff --git a/monetdb5/extras/mal_optimizer_template/opt_sql_append.mx
b/monetdb5/extras/mal_optimizer_template/opt_sql_append.mx
--- a/monetdb5/extras/mal_optimizer_template/opt_sql_append.mx
+++ b/monetdb5/extras/mal_optimizer_template/opt_sql_append.mx
@@ -13,7 +13,7 @@ The Original Code is the MonetDB Databas
The Initial Developer of the Original Code is CWI.
Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
-Copyright August 2008-2011 MonetDB B.V.
+Copyright August 2008-2012 MonetDB B.V.
All Rights Reserved.
@
diff --git a/monetdb5/mal/mal_listing.c b/monetdb5/mal/mal_listing.c
--- a/monetdb5/mal/mal_listing.c
+++ b/monetdb5/mal/mal_listing.c
@@ -13,7 +13,7 @@
*
* The Initial Developer of the Original Code is CWI.
* Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
- * Copyright August 2008-2011 MonetDB B.V.
+ * Copyright August 2008-2012 MonetDB B.V.
* All Rights Reserved.
*/
diff --git a/monetdb5/mal/mal_listing.h b/monetdb5/mal/mal_listing.h
--- a/monetdb5/mal/mal_listing.h
+++ b/monetdb5/mal/mal_listing.h
@@ -13,7 +13,7 @@
*
* The Initial Developer of the Original Code is CWI.
* Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
- * Copyright August 2008-2011 MonetDB B.V.
+ * Copyright August 2008-2012 MonetDB B.V.
* All Rights Reserved.
*/
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
@@ -1219,11 +1219,11 @@ sqltypeinit( sql_allocator *sa)
sql_create_func(sa, "sql_add", "calc", "+", *t, *t, *t,
SCALE_FIX);
sql_create_func(sa, "sql_mul", "calc", "*", *t, *t, *t,
SCALE_MUL);
sql_create_func(sa, "sql_div", "calc", "/", *t, *t, *t,
SCALE_DIV);
- sql_create_func(sa, "bit_and", "calc", "and", *t, *t, *t,
SCALE_FIX);
- sql_create_func(sa, "bit_or", "calc", "or", *t, *t, *t,
SCALE_FIX);
- sql_create_func(sa, "bit_xor", "calc", "xor", *t, *t, *t,
SCALE_FIX);
- sql_create_func(sa, "bit_not", "calc", "not", *t, NULL, *t,
SCALE_FIX);
if (t < floats) {
+ sql_create_func(sa, "bit_and", "calc", "and", *t, *t,
*t, SCALE_FIX);
+ sql_create_func(sa, "bit_or", "calc", "or", *t, *t, *t,
SCALE_FIX);
+ sql_create_func(sa, "bit_xor", "calc", "xor", *t, *t,
*t, SCALE_FIX);
+ sql_create_func(sa, "bit_not", "calc", "not", *t, NULL,
*t, SCALE_FIX);
sql_create_func(sa, "left_shift", "calc", "<<", *t,
INT, *t, SCALE_FIX);
sql_create_func(sa, "right_shift", "calc", ">>", *t,
INT, *t, SCALE_FIX);
}
diff --git a/sql/jdbc/tests/Tests/Test_JdbcClient.SQL.bat
b/sql/jdbc/tests/Tests/Test_JdbcClient.SQL.bat
--- a/sql/jdbc/tests/Tests/Test_JdbcClient.SQL.bat
+++ b/sql/jdbc/tests/Tests/Test_JdbcClient.SQL.bat
@@ -3,8 +3,6 @@
echo user=monetdb> .monetdb
echo password=monetdb>> .monetdb
-set LANG=en_US.UTF-8
-
prompt # $t $g
echo on
diff --git a/sql/jdbc/tests/Tests/Test_JdbcClient.SQL.sh
b/sql/jdbc/tests/Tests/Test_JdbcClient.SQL.sh
--- a/sql/jdbc/tests/Tests/Test_JdbcClient.SQL.sh
+++ b/sql/jdbc/tests/Tests/Test_JdbcClient.SQL.sh
@@ -5,9 +5,6 @@ user=monetdb
password=monetdb
EOF
-LC_CTYPE="en_US.UTF-8"
-export LC_CTYPE
-
Mlog -x "java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d $TSTDB
-f $TSTSRCBASE/$TSTDIR/JdbcClient_create_tables.sql"
Mlog -x "java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d $TSTDB
-f $TSTSRCBASE/$TSTDIR/JdbcClient_inserts_selects.sql"
diff --git
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe-mclient.SF-1146092.SQL.bat
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe-mclient.SF-1146092.SQL.bat
---
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe-mclient.SF-1146092.SQL.bat
+++
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe-mclient.SF-1146092.SQL.bat
@@ -3,8 +3,6 @@
echo user=monetdb> .monetdb
echo password=monetdb>> .monetdb
-set LANG=en_US.UTF-8
-
prompt # $t $g
echo on
diff --git
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe-mclient.SF-1146092.SQL.sh
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe-mclient.SF-1146092.SQL.sh
---
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe-mclient.SF-1146092.SQL.sh
+++
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe-mclient.SF-1146092.SQL.sh
@@ -5,9 +5,6 @@ user=monetdb
password=monetdb
EOF
-LANG="en_US.UTF-8"
-export LANG
-
Mlog -x "$MTIMEOUT $SQLCLIENT -h$HOST -p$MAPIPORT -d$TSTDB -ftest -i -e <
\"$TSTSRCDIR/alter_table_describe.SF-1146092-src.sql\""
rm -f .monetdb
diff --git
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe.SF-1146092.SQL.bat
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe.SF-1146092.SQL.bat
---
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe.SF-1146092.SQL.bat
+++
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe.SF-1146092.SQL.bat
@@ -3,8 +3,6 @@
echo user=monetdb> .monetdb
echo password=monetdb>> .monetdb
-set LANG=en_US.UTF-8
-
prompt # $t $g
echo on
diff --git
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe.SF-1146092.SQL.sh
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe.SF-1146092.SQL.sh
---
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe.SF-1146092.SQL.sh
+++
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe.SF-1146092.SQL.sh
@@ -5,9 +5,6 @@ user=monetdb
password=monetdb
EOF
-LANG="en_US.UTF-8"
-export LANG
-
Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT
-d $TSTDB -f \"$TSTSRCDIR/alter_table_describe.SF-1146092-src.sql\""
rm -f .monetdb
diff --git a/sql/test/BugDay_2005-10-06_2.9.3/Tests/not_null.SF-933194.SQL.bat
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/not_null.SF-933194.SQL.bat
--- a/sql/test/BugDay_2005-10-06_2.9.3/Tests/not_null.SF-933194.SQL.bat
+++ b/sql/test/BugDay_2005-10-06_2.9.3/Tests/not_null.SF-933194.SQL.bat
@@ -3,8 +3,6 @@
echo user=monetdb> .monetdb
echo password=monetdb>> .monetdb
-set LANG=en_US.UTF-8
-
prompt # $t $g
echo on
diff --git a/sql/test/BugDay_2005-10-06_2.9.3/Tests/not_null.SF-933194.SQL.sh
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/not_null.SF-933194.SQL.sh
--- a/sql/test/BugDay_2005-10-06_2.9.3/Tests/not_null.SF-933194.SQL.sh
+++ b/sql/test/BugDay_2005-10-06_2.9.3/Tests/not_null.SF-933194.SQL.sh
@@ -5,9 +5,6 @@ user=monetdb
password=monetdb
EOF
-LANG="en_US.UTF-8"
-export LANG
-
Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT
-d $TSTDB -f \"$TSTSRCDIR/not_null.SF-933194-src.sql\""
diff --git
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/type_dump_test.SF-989257.SQL.bat
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/type_dump_test.SF-989257.SQL.bat
--- a/sql/test/BugDay_2005-10-06_2.9.3/Tests/type_dump_test.SF-989257.SQL.bat
+++ b/sql/test/BugDay_2005-10-06_2.9.3/Tests/type_dump_test.SF-989257.SQL.bat
@@ -3,8 +3,6 @@
echo user=monetdb> .monetdb
echo password=monetdb>> .monetdb
-set LANG=en_US.UTF-8
-
prompt # $t $g
echo on
diff --git
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/type_dump_test.SF-989257.SQL.sh
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/type_dump_test.SF-989257.SQL.sh
--- a/sql/test/BugDay_2005-10-06_2.9.3/Tests/type_dump_test.SF-989257.SQL.sh
+++ b/sql/test/BugDay_2005-10-06_2.9.3/Tests/type_dump_test.SF-989257.SQL.sh
@@ -5,9 +5,6 @@ user=monetdb
password=monetdb
EOF
-LANG="en_US.UTF-8"
-export LANG
-
Mlog -x "$MTIMEOUT java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT
-d $TSTDB -f \"$TSTSRCDIR/type_dump_test.SF-989257-src.sql\""
rm -f .monetdb
diff --git a/sql/test/BugTracker-2011/Tests/All
b/sql/test/BugTracker-2011/Tests/All
--- a/sql/test/BugTracker-2011/Tests/All
+++ b/sql/test/BugTracker-2011/Tests/All
@@ -63,3 +63,4 @@ update_with_count.Bug-2928
user_create_temp_table.Bug-2916
exists-select.Bug-2933
jena-optional-1-test.Bug-2915
+and-power.Bug-3013
diff --git a/sql/test/BugTracker-2011/Tests/and-power.Bug-3013.sql
b/sql/test/BugTracker-2011/Tests/and-power.Bug-3013.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2011/Tests/and-power.Bug-3013.sql
@@ -0,0 +1,1 @@
+select bit_and(1, power(2, 1));
diff --git a/sql/test/BugTracker-2011/Tests/and-power.Bug-3013.stable.err
b/sql/test/BugTracker-2011/Tests/and-power.Bug-3013.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2011/Tests/and-power.Bug-3013.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'and-power.Bug-3013` in directory 'test/BugTracker-2011` itself:
+
+
+# 14:12:27 >
+# 14:12:27 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/ufs/sjoerd/Monet-stable/var/MonetDB" "--set" "mapi_open=true"
"--set" "mapi_port=30422" "--set" "monet_prompt=" "--trace" "--forcemito"
"--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2011" "--set"
"mal_listing=0"
+# 14:12:27 >
+
+# 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 = 30422
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_test_BugTracker-2011
+# cmdline opt mal_listing = 0
+
+# 14:12:27 >
+# 14:12:27 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=madrid"
"--port=30422"
+# 14:12:27 >
+
+
+# 14:12:27 >
+# 14:12:27 > "Done."
+# 14:12:27 >
+
diff --git a/sql/test/BugTracker-2011/Tests/and-power.Bug-3013.stable.out
b/sql/test/BugTracker-2011/Tests/and-power.Bug-3013.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2011/Tests/and-power.Bug-3013.stable.out
@@ -0,0 +1,57 @@
+stdout of test 'and-power.Bug-3013` in directory 'test/BugTracker-2011` itself:
+
+
+# 14:12:27 >
+# 14:12:27 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/ufs/sjoerd/Monet-stable/var/MonetDB" "--set" "mapi_open=true"
"--set" "mapi_port=30422" "--set" "monet_prompt=" "--trace" "--forcemito"
"--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2011" "--set"
"mal_listing=0"
+# 14:12:27 >
+
+# MonetDB 5 server v11.7.6 (hg id: fc936b0e04ac+)
+# This is an unreleased version
+# Serving database 'mTests_test_BugTracker-2011', 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:30422/
+# 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: 40_geom.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 99_system.sql
+
+# 14:12:27 >
+# 14:12:27 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=madrid"
"--port=30422"
+# 14:12:27 >
+
+#select bit_and(1, power(2, 1));
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
