Changeset: 4493943e12a6 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4493943e12a6 Modified Files: Branch: default Log Message:
Merge with Oct2010 branch. diffs (68 lines): diff -r f93f901818b4 -r 4493943e12a6 sql/src/test/BugTracker-2009/Tests/set_history_and_drop_table.SF-2607045.stable.out --- a/sql/src/test/BugTracker-2009/Tests/set_history_and_drop_table.SF-2607045.stable.out Thu Sep 16 09:24:18 2010 +0200 +++ b/sql/src/test/BugTracker-2009/Tests/set_history_and_drop_table.SF-2607045.stable.out Thu Sep 16 11:39:27 2010 +0200 @@ -26,40 +26,9 @@ # 23:32:55 > Run test -% .tables # table_name -% id # name -% int # type -% 4 # length -[ 2001 ] -[ 2006 ] -[ 2015 ] -[ 2024 ] -[ 2032 ] -[ 2042 ] -[ 2046 ] -[ 2055 ] -[ 2064 ] -[ 2075 ] -[ 2082 ] -[ 2087 ] -[ 2098 ] -[ 2104 ] -[ 2113 ] -[ 2124 ] -[ 2131 ] -[ 2136 ] -[ 2147 ] -[ 5063 ] -[ 5073 ] -[ 5093 ] -[ 5101 ] -[ 5105 ] -[ 5108 ] -[ 5112 ] -[ 5129 ] -[ 5229 ] -[ 5243 ] -[ 5260 ] +#set history = true; +#create table t1 (id int); +#drop table t1; Drop history # 23:32:55 > diff -r f93f901818b4 -r 4493943e12a6 sql/src/test/BugTracker-2009/drop_history.sql --- a/sql/src/test/BugTracker-2009/drop_history.sql Thu Sep 16 09:24:18 2010 +0200 +++ b/sql/src/test/BugTracker-2009/drop_history.sql Thu Sep 16 11:39:27 2010 +0200 @@ -1,6 +1,2 @@ -drop procedure keepCall; -drop procedure keepQuery; -drop procedure resetHistory; -drop view queryLog; -drop table callHistory; -drop table queryHistory; +set history = false; +call resetHistory(); diff -r f93f901818b4 -r 4493943e12a6 sql/src/test/BugTracker-2009/set_history_and_drop_table.SF-2607045.sql --- a/sql/src/test/BugTracker-2009/set_history_and_drop_table.SF-2607045.sql Thu Sep 16 09:24:18 2010 +0200 +++ b/sql/src/test/BugTracker-2009/set_history_and_drop_table.SF-2607045.sql Thu Sep 16 11:39:27 2010 +0200 @@ -1,4 +1,3 @@ -set history='true'; -select id from tables where id > 0; +set history = true; create table t1 (id int); drop table t1; _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list