Changeset: eb3f4b57099a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=eb3f4b57099a Modified Files: monetdb5/mal/Tests/tst060.stable.out sql/test/Tests/oltp.stable.out sql/test/oltp.sql Branch: oltp Log Message:
Approve tests diffs (103 lines): diff --git a/monetdb5/mal/Tests/tst060.stable.out b/monetdb5/mal/Tests/tst060.stable.out --- a/monetdb5/mal/Tests/tst060.stable.out +++ b/monetdb5/mal/Tests/tst060.stable.out @@ -29,6 +29,7 @@ Ready. # io.print(s1); [ "bye" ] +[ 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 000000 ] # 07:58:48 > # 07:58:48 > Done. diff --git a/sql/test/Tests/oltp.stable.out b/sql/test/Tests/oltp.stable.out --- a/sql/test/Tests/oltp.stable.out +++ b/sql/test/Tests/oltp.stable.out @@ -69,20 +69,23 @@ Ready. #create table tmp_oltp(i integer); #insert into tmp_oltp values(1); -[ 1 ] +[ 4 ] #insert into tmp_oltp values(2),(3); -[ 2 ] -#select username,lockid,cnt,query from oltp_locks(); -% .L, .L, .L, .L # table_name -% username, lockid, cnt, query # name -% clob, int, int, clob # type -% 0, 3, 1, 0 # length -[ NULL, 225, 1, NULL ] -[ NULL, 801, 2, NULL ] +[ 5 ] +#select username,lockid,cnt from oltp_locks(); +% .L1, .L1, .L1 # table_name +% username, lockid, cnt # name +% clob, int, int # type +% 0, 3, 1 # length +[ NULL, 225, 1 ] +[ NULL, 801, 2 ] +#call oltp_disable(); +#OLTP 1770 reset locktable +#OLTP 1770 disabled #insert into tmp_oltp values(4); [ 1 ] #insert into tmp_oltp values(5); -[ 1 ] +[ 4 ] #select * from tmp_oltp; % sys.tmp_oltp # table_name % i # name @@ -94,18 +97,20 @@ Ready. [ 4 ] [ 5 ] #drop table tmp_oltp; -#select username,lockid,cnt,query from oltp_locks(); -% .L, .L, .L, .L # table_name -% username, lockid, cnt, query # name -% clob, int, int, clob # type -% 0, 3, 1, 0 # length -[ NULL, 225, 1, NULL ] -[ NULL, 801, 1, NULL ] -#select username,lockid,cnt,query from oltp_locks(); -% .L, .L, .L, .L # table_name -% username, lockid, cnt, query # name -% clob, int, int, clob # type -% 0, 1, 1, 0 # length +#select username,lockid,cnt from oltp_locks(); +% .L1, .L1, .L1 # table_name +% username, lockid, cnt # name +% clob, int, int # type +% 0, 3, 1 # length +[ NULL, 225, 1 ] +[ NULL, 801, 1 ] +#call oltp_reset(); +#OLTP 1776 reset locktable +#select username,lockid,cnt from oltp_locks(); +% .L1, .L1, .L1 # table_name +% username, lockid, cnt # name +% clob, int, int # type +% 0, 1, 1 # length # 21:18:59 > # 21:18:59 > "Done." diff --git a/sql/test/oltp.sql b/sql/test/oltp.sql --- a/sql/test/oltp.sql +++ b/sql/test/oltp.sql @@ -3,7 +3,7 @@ create table tmp_oltp(i integer); insert into tmp_oltp values(1); insert into tmp_oltp values(2),(3); -select username,lockid,cnt,query from oltp_locks(); +select username,lockid,cnt from oltp_locks(); call oltp_disable(); insert into tmp_oltp values(4); @@ -12,7 +12,7 @@ call oltp_enable(); insert into tmp_oltp values(5); select * from tmp_oltp; drop table tmp_oltp; -select username,lockid,cnt,query from oltp_locks(); +select username,lockid,cnt from oltp_locks(); call oltp_reset(); -select username,lockid,cnt,query from oltp_locks(); +select username,lockid,cnt from oltp_locks(); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
