Changeset: 9e01122c07e1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9e01122c07e1
Added Files:
sql/test/BugTracker-2019/Tests/set-schema-mclient-msg.Bug-6754.sql
sql/test/BugTracker-2019/Tests/set-schema-mclient-msg.Bug-6754.stable.err
sql/test/BugTracker-2019/Tests/set-schema-mclient-msg.Bug-6754.stable.out
Modified Files:
clients/mapiclient/mclient.c
monetdb5/modules/kernel/mmath.c
sql/server/sql_privileges.c
sql/test/BugTracker-2019/Tests/All
sql/test/BugTracker-2019/Tests/index-insert-crash.Bug-6781.sql
sql/test/BugTracker-2019/Tests/index-insert-crash.Bug-6781.stable.out
Branch: default
Log Message:
Merge with Nov2019 branch.
diffs (260 lines):
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -1933,7 +1933,7 @@ format_result(Mapi mid, MapiHdl hdl, boo
SQLqueryEcho(hdl);
if (formatter == TABLEformatter ||
formatter == ROWCOUNTformatter)
- mnstr_printf(toConsole, "operation
successful\n");
+ mnstr_printf(toConsole, "auto commit mode:
%s\n", mapi_get_autocommit(mid) ? "on" : "off");
timerHuman(sqloptimizer, maloptimizer, querytime,
singleinstr, false);
continue;
case Q_PREPARE:
diff --git a/monetdb5/modules/kernel/mmath.c b/monetdb5/modules/kernel/mmath.c
--- a/monetdb5/modules/kernel/mmath.c
+++ b/monetdb5/modules/kernel/mmath.c
@@ -295,6 +295,7 @@ str
MATHsqlrandint(int *res, const int *seed)
{
#ifdef STATIC_CODE_ANALYSIS
+ (void) seed;
*res = 0;
#else
MT_lock_set(&mmath_rse_lock);
diff --git a/sql/server/sql_privileges.c b/sql/server/sql_privileges.c
--- a/sql/server/sql_privileges.c
+++ b/sql/server/sql_privileges.c
@@ -754,11 +754,11 @@ mvc_set_schema(mvc *m, char *schema)
if (m->session->schema_name)
_DELETE(m->session->schema_name);
m->session->schema_name = new_schema_name;
- m->type = Q_TRANS;
+ m->type = Q_SCHEMA;
if (m->session->tr->active)
m->session->schema = s;
ret = 1;
- } else if(new_schema_name) {
+ } else if (new_schema_name) {
_DELETE(new_schema_name);
}
return ret;
diff --git a/sql/test/BugTracker-2019/Tests/All
b/sql/test/BugTracker-2019/Tests/All
--- a/sql/test/BugTracker-2019/Tests/All
+++ b/sql/test/BugTracker-2019/Tests/All
@@ -32,6 +32,7 @@ sequences-defaults.Bug-6744
sequences-types.Bug-6745
alter_table_drop_column.Bug-6749
KNOWNFAIL&HAVE_PYMONETDB?remote-table-non-existent-column.Bug-6750
+set-schema-mclient-msg.Bug-6754
cte-union.Bug-6755
merge-table-limit.Bug-6756
double-free.Bug-6757
diff --git a/sql/test/BugTracker-2019/Tests/index-insert-crash.Bug-6781.sql
b/sql/test/BugTracker-2019/Tests/index-insert-crash.Bug-6781.sql
--- a/sql/test/BugTracker-2019/Tests/index-insert-crash.Bug-6781.sql
+++ b/sql/test/BugTracker-2019/Tests/index-insert-crash.Bug-6781.sql
@@ -1,9 +1,13 @@
start transaction;
create table a(a int, b int, id bigserial);
create ordered index a_pk on a(id);
+create imprints index a_impk on a(id);
create index a_idx1 on a(a);
+select type, name from sys.idxs where table_id in (select id from sys._tables
where name = 'a');
+
insert into a(a) values(1), (2);
update a set a = 3, b = 3 where a = 1;
+select * from a;
delete from a where a = 3;
truncate table a;
rollback;
diff --git
a/sql/test/BugTracker-2019/Tests/index-insert-crash.Bug-6781.stable.out
b/sql/test/BugTracker-2019/Tests/index-insert-crash.Bug-6781.stable.out
--- a/sql/test/BugTracker-2019/Tests/index-insert-crash.Bug-6781.stable.out
+++ b/sql/test/BugTracker-2019/Tests/index-insert-crash.Bug-6781.stable.out
@@ -17,45 +17,6 @@ stdout of test 'index-insert-crash.Bug-6
# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-320772/.s.monetdb.39858
# MonetDB/GIS module loaded
# SQL catalog created, loading sql scripts once
-# loading sql script: 09_like.sql
-# loading sql script: 10_math.sql
-# loading sql script: 12_url.sql
-# loading sql script: 13_date.sql
-# loading sql script: 14_inet.sql
-# loading sql script: 15_querylog.sql
-# loading sql script: 16_tracelog.sql
-# loading sql script: 17_temporal.sql
-# loading sql script: 18_index.sql
-# loading sql script: 20_vacuum.sql
-# loading sql script: 21_dependency_views.sql
-# loading sql script: 22_clients.sql
-# loading sql script: 23_skyserver.sql
-# loading sql script: 25_debug.sql
-# loading sql script: 26_sysmon.sql
-# loading sql script: 27_rejects.sql
-# loading sql script: 39_analytics.sql
-# loading sql script: 39_analytics_hge.sql
-# loading sql script: 40_geom.sql
-# loading sql script: 40_json.sql
-# loading sql script: 40_json_hge.sql
-# loading sql script: 41_md5sum.sql
-# loading sql script: 45_uuid.sql
-# loading sql script: 46_profiler.sql
-# loading sql script: 51_sys_schema_extension.sql
-# loading sql script: 60_wlcr.sql
-# loading sql script: 61_wlcr.sql
-# loading sql script: 72_fits.sql
-# loading sql script: 74_netcdf.sql
-# loading sql script: 75_lidar.sql
-# loading sql script: 75_shp.sql
-# loading sql script: 75_storagemodel.sql
-# loading sql script: 80_statistics.sql
-# loading sql script: 80_udf.sql
-# loading sql script: 80_udf_hge.sql
-# loading sql script: 85_bam.sql
-# loading sql script: 90_generator.sql
-# loading sql script: 90_generator_hge.sql
-# loading sql script: 99_system.sql
# MonetDB/SQL module loaded
# 16:41:06 >
@@ -66,10 +27,26 @@ stdout of test 'index-insert-crash.Bug-6
#create table a(a int, b int, id bigserial);
#create ordered index a_pk on a(id);
#create index a_idx1 on a(a);
+#select type, name from sys.idxs where table_id in (select id from sys._tables
where name = 'a');
+% sys.idxs, sys.idxs # table_name
+% type, name # name
+% int, varchar # type
+% 1, 9 # length
+[ 0, "a_id_pkey" ]
+[ 5, "a_pk" ]
+[ 4, "a_impk" ]
+[ 0, "a_idx1" ]
#insert into a(a) values(1), (2);
[ 2 ]
#update a set a = 3, b = 3 where a = 1;
[ 1 ]
+#select * from a;
+% sys.a, sys.a, sys.a # table_name
+% a, b, id # name
+% int, int, bigint # type
+% 1, 1, 1 # length
+[ 3, 3, 1 ]
+[ 2, NULL, 2 ]
#delete from a where a = 3;
[ 1 ]
#truncate a;
diff --git a/sql/test/BugTracker-2019/Tests/set-schema-mclient-msg.Bug-6754.sql
b/sql/test/BugTracker-2019/Tests/set-schema-mclient-msg.Bug-6754.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2019/Tests/set-schema-mclient-msg.Bug-6754.sql
@@ -0,0 +1,19 @@
+set schema sys;
+set schema json;
+set role monetdb;
+
+declare a int;
+set a = 4;
+select a;
+
+set schema sys;
+
+start transaction;
+commit;
+
+start transaction;
+rollback;
+
+set transaction;
+rollback;
+
diff --git
a/sql/test/BugTracker-2019/Tests/set-schema-mclient-msg.Bug-6754.stable.err
b/sql/test/BugTracker-2019/Tests/set-schema-mclient-msg.Bug-6754.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2019/Tests/set-schema-mclient-msg.Bug-6754.stable.err
@@ -0,0 +1,32 @@
+stderr of test 'set-schema-mclient-msg.Bug-6754` in directory
'sql/test/BugTracker-2019` itself:
+
+
+# 16:44:26 >
+# 16:44:26 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32885" "--set"
"mapi_usock=/var/tmp/mtest-11704/.s.monetdb.32885" "--forcemito"
"--dbpath=/home/dinther/dev/dev/INSTALL/var/MonetDB/mTests_sql_test_BugTracker-2019"
"--set" "embedded_r=yes" "--set" "embedded_py=2" "--set" "embedded_c=true"
+# 16:44:26 >
+
+# builtin opt gdk_dbpath =
/home/dinther/dev/dev/INSTALL/var/monetdb5/dbfarm/demo
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_ipv6 = 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 mapi_open = true
+# cmdline opt mapi_port = 32885
+# cmdline opt mapi_usock = /var/tmp/mtest-11704/.s.monetdb.32885
+# cmdline opt gdk_dbpath =
/home/dinther/dev/dev/INSTALL/var/MonetDB/mTests_sql_test_BugTracker-2019
+# cmdline opt embedded_r = yes
+# cmdline opt embedded_py = 2
+# cmdline opt embedded_c = true
+
+# 16:44:26 >
+# 16:44:26 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-11704" "--port=32885"
+# 16:44:26 >
+
+
+# 16:44:26 >
+# 16:44:26 > "Done."
+# 16:44:26 >
+
diff --git
a/sql/test/BugTracker-2019/Tests/set-schema-mclient-msg.Bug-6754.stable.out
b/sql/test/BugTracker-2019/Tests/set-schema-mclient-msg.Bug-6754.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2019/Tests/set-schema-mclient-msg.Bug-6754.stable.out
@@ -0,0 +1,50 @@
+stdout of test 'set-schema-mclient-msg.Bug-6754` in directory
'sql/test/BugTracker-2019` itself:
+
+
+# 16:44:26 >
+# 16:44:26 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32885" "--set"
"mapi_usock=/var/tmp/mtest-11704/.s.monetdb.32885" "--forcemito"
"--dbpath=/home/dinther/dev/dev/INSTALL/var/MonetDB/mTests_sql_test_BugTracker-2019"
"--set" "embedded_r=yes" "--set" "embedded_py=2" "--set" "embedded_c=true"
+# 16:44:26 >
+
+# MonetDB 5 server v11.35.10 (hg id: 2316cbb981fe+)
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2019', using 8 threads
+# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers
+# Found 31.243 GiB available main-memory of which we use 25.463 GiB
+# Copyright (c) 1993 - July 2008 CWI.
+# Copyright (c) August 2008 - 2020 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://monetdb-nuc2:32885/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-11704/.s.monetdb.32885
+# MonetDB/GIS module loaded
+# SQL catalog created, loading sql scripts once
+# MonetDB/SQL module loaded
+# MonetDB/Python2 module loaded
+# MonetDB/R module loaded
+
+# 16:44:26 >
+# 16:44:26 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-11704" "--port=32885"
+# 16:44:26 >
+
+#set schema sys;
+#set schema json;
+#set role monetdb;
+#declare a int;
+#set a = 4;
+#select a;
+% .L2 # table_name
+% L2 # name
+% int # type
+% 1 # length
+[ 4 ]
+#set schema sys;
+#start transaction;
+#commit;
+#start transaction;
+#rollback;
+#set transaction;
+#rollback;
+
+# 16:44:26 >
+# 16:44:26 > "Done."
+# 16:44:26 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
