Changeset: f2bfdd9ee094 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f2bfdd9ee094
Added Files:
sql/test/BugTracker-2013/Tests/alter_resets_readonly.Bug-3362.sql
sql/test/BugTracker-2013/Tests/alter_resets_readonly.Bug-3362.stable.err
sql/test/BugTracker-2013/Tests/alter_resets_readonly.Bug-3362.stable.out
Modified Files:
sql/storage/store.c
sql/test/BugTracker-2013/Tests/All
Branch: default
Log Message:
Merge with Feb2013 branch.
diffs (139 lines):
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -1172,6 +1172,10 @@ dup_sql_table(sql_allocator *sa, sql_tab
sql_table *nt = create_sql_table(sa, t->base.name, t->type, t->system,
SQL_DECLARED_TABLE, t->commit_action);
nt->base.flag = t->base.flag;
+
+ nt->readonly = t->readonly;
+ nt->query = (t->query) ? sa_strdup(sa, t->query) : NULL;
+
for (n = t->columns.set->h; n; n = n->next)
dup_sql_column(sa, nt, n->data);
nt->columns.dset = NULL;
@@ -2693,6 +2697,8 @@ rollforward_update_table(sql_trans *tr,
fprintf(stderr, "#update table %s\n",
tt->base.name);
ok = store_funcs.update_table(tr, ft, tt);
ft->cleared = 0;
+ ft->base.rtime = ft->base.wtime = 0;
+ tt->readonly = ft->readonly;
}
}
return ok;
diff --git a/sql/test/BugTracker-2013/Tests/All
b/sql/test/BugTracker-2013/Tests/All
--- a/sql/test/BugTracker-2013/Tests/All
+++ b/sql/test/BugTracker-2013/Tests/All
@@ -49,3 +49,4 @@ copy-into-compressed.Bug-3351
median.Bug-3352
check-constraint.Bug-3335
crash_after_creation_of_unique_key.Bug-3363
+alter_resets_readonly.Bug-3362
diff --git a/sql/test/BugTracker-2013/Tests/alter_resets_readonly.Bug-3362.sql
b/sql/test/BugTracker-2013/Tests/alter_resets_readonly.Bug-3362.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/alter_resets_readonly.Bug-3362.sql
@@ -0,0 +1,8 @@
+create table x(a int);
+insert into x values (1),(2),(3);
+alter table x set read only;
+select readonly from sys.tables where name='x';
+alter table x add primary key (a);
+select readonly from sys.tables where name='x';
+drop table x;
+
diff --git
a/sql/test/BugTracker-2013/Tests/alter_resets_readonly.Bug-3362.stable.err
b/sql/test/BugTracker-2013/Tests/alter_resets_readonly.Bug-3362.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/alter_resets_readonly.Bug-3362.stable.err
@@ -0,0 +1,35 @@
+stderr of test 'alter_resets_readonly.Bug-3362` in directory
'sql/test/BugTracker-2013` itself:
+
+
+# 15:44:27 >
+# 15:44:27 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39723" "--set"
"mapi_usock=/var/tmp/mtest-3611/.s.monetdb.39723" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2013"
"--set" "mal_listing=0"
+# 15:44:27 >
+
+# builtin opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# 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 mapi_open = true
+# cmdline opt mapi_port = 39723
+# cmdline opt mapi_usock = /var/tmp/mtest-3611/.s.monetdb.39723
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2013
+# cmdline opt mal_listing = 0
+
+# 15:44:28 >
+# 15:44:28 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-3611" "--port=39723"
+# 15:44:28 >
+
+
+# 15:44:28 >
+# 15:44:28 > "Done."
+# 15:44:28 >
+
diff --git
a/sql/test/BugTracker-2013/Tests/alter_resets_readonly.Bug-3362.stable.out
b/sql/test/BugTracker-2013/Tests/alter_resets_readonly.Bug-3362.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/alter_resets_readonly.Bug-3362.stable.out
@@ -0,0 +1,50 @@
+stdout of test 'alter_resets_readonly.Bug-3362` in directory
'sql/test/BugTracker-2013` itself:
+
+
+# 15:44:27 >
+# 15:44:27 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39723" "--set"
"mapi_usock=/var/tmp/mtest-3611/.s.monetdb.39723" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2013"
"--set" "mal_listing=0"
+# 15:44:27 >
+
+# MonetDB 5 server v11.15.12
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2013', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 3.775 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2013 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on
mapi:monetdb://niels.nesco.mine.nu:39723/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-3611/.s.monetdb.39723
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 15:44:28 >
+# 15:44:28 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-3611" "--port=39723"
+# 15:44:28 >
+
+#create table x(a int);
+#insert into x values (1),(2),(3);
+[ 3 ]
+#alter table x set read only;
+#select readonly from sys.tables where name='x';
+% .tables # table_name
+% readonly # name
+% boolean # type
+% 5 # length
+[ true ]
+#alter table x add primary key (a);
+#select readonly from sys.tables where name='x';
+% .tables # table_name
+% readonly # name
+% boolean # type
+% 5 # length
+[ true ]
+#drop table x;
+
+# 15:44:28 >
+# 15:44:28 > "Done."
+# 15:44:28 >
+
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
