Changeset: 9fd6e148c805 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9fd6e148c805
Modified Files:
sql/test/BugTracker-2011/Tests/All
Branch: Aug2011
Log Message:
merging (resolved conflict)
diffs (210 lines):
diff --git a/libversions b/libversions
--- a/libversions
+++ b/libversions
@@ -19,14 +19,16 @@
# public release, then set AGE to 0.
# In other words
-# - if there are no code changes, don't change version numbers;
-# - if there are changes to the code (bug fixes) but no API changes,
-# just increment REVISION;
-# - if there are only backward compatible API changes (new
-# interfaces), increment both CURRENT and AGE, and set REVISION to
-# 0;
-# - if there are also incompatible API changes (interfaces removed or
-# changed), increment CURRENT, and set AGE and REVISION to 0.
+# X if there are no code changes, don't change version numbers;
+# FIX if there are changes to the code (bug fixes) but no API changes,
+# just increment REVISION;
+# NEW if there are only backward compatible API changes (new
+# interfaces), increment both CURRENT and AGE, and set REVISION to
+# 0;
+# BRK if there are also incompatible API changes (interfaces removed or
+# changed), increment CURRENT, and set AGE and REVISION to 0.
+
+# the numbers are: <CURRENT>:<REVISION>:<AGE>
# version of the GDK library (subdirectory gdk; also includes
# common/options and common/mutils)
@@ -36,6 +38,7 @@ GDK_VERSION=4:1:0
MAPI_VERSION=4:0:1
# version of the MONETDB5 library (subdirectory monetdb5, not including extras)
+# 26cb61b1604b: NEW
MONETDB5_VERSION=8:1:0
# version of the STREAM library (subdirectory common/stream)
diff --git a/monetdb5/mal/mal_instruction.mx b/monetdb5/mal/mal_instruction.mx
--- a/monetdb5/mal/mal_instruction.mx
+++ b/monetdb5/mal/mal_instruction.mx
@@ -1737,7 +1737,7 @@ defConstant(MalBlkPtr mb, int type, ValP
/* free old value */
ft= getTypeName(otype);
tt= getTypeName(type);
- showException(SYNTAX, "defConstant", "constant coercion
error from %s to %s: %s", ft, tt, msg);
+ showException(SYNTAX, "defConstant", "constant coercion
error from %s to %s", ft,tt);
GDKfree(ft);
GDKfree(tt);
mb->errors++;
diff --git a/monetdb5/modules/mal/Tests/inspect05.stable.out
b/monetdb5/modules/mal/Tests/inspect05.stable.out
--- a/monetdb5/modules/mal/Tests/inspect05.stable.out
+++ b/monetdb5/modules/mal/Tests/inspect05.stable.out
@@ -5383,6 +5383,7 @@ end main;
[ "round", "command", "mmath",
"(x:flt,y:int):flt ",
"MATHbinary_ROUNDflt;"
]
[ "radians", "command", "mmath", "(x:dbl):dbl
",
"MATHunary_RADIANSdbl;" ]
[ "radians", "command", "mmath", "(x:flt):flt
",
"MATHunary_RADIANSflt;" ]
+[ "sqlrand", "command", "mmath",
"(seed:int):int ",
"MATHsqlrandint;" ]
[ "srand", "command", "mmath",
"(seed:int):void ",
"MATHsrandint;"
]
[ "sqrt", "command", "mmath", "(y:dbl):dbl
",
"MATHunary_SQRTdbl;"
]
[ "sqrt", "command", "mmath", "(y:flt):flt
",
"MATHunary_SQRTflt;"
]
diff --git a/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
b/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
--- a/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
+++ b/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
@@ -5383,6 +5383,7 @@ end main;
[ "round", "command", "mmath",
"(x:flt,y:int):flt ",
"MATHbinary_ROUNDflt;"
]
[ "radians", "command", "mmath", "(x:dbl):dbl
",
"MATHunary_RADIANSdbl;" ]
[ "radians", "command", "mmath", "(x:flt):flt
",
"MATHunary_RADIANSflt;" ]
+[ "sqlrand", "command", "mmath",
"(seed:int):int ",
"MATHsqlrandint;" ]
[ "srand", "command", "mmath",
"(seed:int):void ",
"MATHsrandint;"
]
[ "sqrt", "command", "mmath", "(y:dbl):dbl
",
"MATHunary_SQRTdbl;"
]
[ "sqrt", "command", "mmath", "(y:flt):flt
",
"MATHunary_SQRTflt;"
]
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
@@ -46,5 +46,6 @@ div_zero_problem.Bug-2893
non-stable-select-bug.Bug-2894
HAVE_PERL?perl-short-read-bug.Bug-2897
device-self-ref-fk
+missing_refine_reverse.Bug-2898
rand-with-seed.Bug-2900
-missing_refine_reverse.Bug-2898
+alter-table-set-read-only.bug-2906
diff --git
a/sql/test/BugTracker-2011/Tests/alter-table-set-read-only.bug-2906.sql
b/sql/test/BugTracker-2011/Tests/alter-table-set-read-only.bug-2906.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2011/Tests/alter-table-set-read-only.bug-2906.sql
@@ -0,0 +1,7 @@
+create table t_2906 (a_2906 int);
+insert into t_2906 values (1);
+select * from t_2906;
+alter table t_2906 set read only;
+insert into t_2906 values (2);
+select * from t_2906;
+drop table t_2906;
diff --git
a/sql/test/BugTracker-2011/Tests/alter-table-set-read-only.bug-2906.stable.err
b/sql/test/BugTracker-2011/Tests/alter-table-set-read-only.bug-2906.stable.err
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2011/Tests/alter-table-set-read-only.bug-2906.stable.err
@@ -0,0 +1,40 @@
+stderr of test 'alter-table-set-read-only.bug-2906` in directory
'test/BugTracker-2011` itself:
+
+
+# 09:30:10 >
+# 09:30:10 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/HG/Aug2011/prefix/_/var/MonetDB"
"--set" "mapi_open=true" "--set" "mapi_port=38856" "--set" "monet_prompt="
"--trace" "--forcemito" "--set" "mal_listing=2"
"--dbname=mTests_test_BugTracker-2011" "--set" "mal_listing=0"
+# 09:30:10 >
+
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm =
/net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/HG/Aug2011/prefix/_/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 =
/net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/HG/Aug2011/prefix/_/var/MonetDB
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 38856
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_test_BugTracker-2011
+# cmdline opt mal_listing = 0
+
+# 09:30:10 >
+# 09:30:10 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=rig"
"--port=38856"
+# 09:30:10 >
+
+MAPI = monetdb@rig:38856
+QUERY = insert into t_2906 values (2);
+ERROR = !INSERT INTO: cannot insert into read only table 't_2906'
+
+# 09:30:10 >
+# 09:30:10 > "Done."
+# 09:30:10 >
+
diff --git
a/sql/test/BugTracker-2011/Tests/alter-table-set-read-only.bug-2906.stable.out
b/sql/test/BugTracker-2011/Tests/alter-table-set-read-only.bug-2906.stable.out
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2011/Tests/alter-table-set-read-only.bug-2906.stable.out
@@ -0,0 +1,67 @@
+stdout of test 'alter-table-set-read-only.bug-2906` in directory
'test/BugTracker-2011` itself:
+
+
+# 09:30:10 >
+# 09:30:10 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/HG/Aug2011/prefix/_/var/MonetDB"
"--set" "mapi_open=true" "--set" "mapi_port=38856" "--set" "monet_prompt="
"--trace" "--forcemito" "--set" "mal_listing=2"
"--dbname=mTests_test_BugTracker-2011" "--set" "mal_listing=0"
+# 09:30:10 >
+
+# MonetDB 5 server v11.5.4
+# This is an unreleased version
+# Serving database 'mTests_test_BugTracker-2011', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 7.749 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2011 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://rig.ins.cwi.nl:38856/
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+# SQL catalog created, loading sql scripts once
+# 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
+
+# 09:30:10 >
+# 09:30:10 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=rig"
"--port=38856"
+# 09:30:10 >
+
+#create table t_2906 (a_2906 int);
+#insert into t_2906 values (1);
+[ 1 ]
+#select * from t_2906;
+% sys.t_2906 # table_name
+% a_2906 # name
+% int # type
+% 1 # length
+[ 1 ]
+#alter table t_2906 set read only;
+#select * from t_2906;
+% sys.t_2906 # table_name
+% a_2906 # name
+% int # type
+% 1 # length
+[ 1 ]
+#drop table t_2906;
+
+# 09:30:10 >
+# 09:30:10 > "Done."
+# 09:30:10 >
+
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
