diff --git a/src/test/bench/query01 b/src/test/bench/query01
index 0ed3a7b1e58ffad24838ef553cf0b9596a96f316..07050b6cc787de1ad4de4b30313346a22a2a4174 100644
--- a/src/test/bench/query01
+++ b/src/test/bench/query01
@@ -1,4 +1,4 @@
-select * into table temp from tenk1 where (unique2 > 301) and (unique2 < 402);
-drop table temp;
-select * into table temp from tenk1 where (unique2 > 301) and (unique2 < 402);
-drop table temp;
+select * into table temp_bench from tenk1 where (unique2 > 301) and (unique2 < 402);
+drop table temp_bench;
+select * into table temp_bench from tenk1 where (unique2 > 301) and (unique2 < 402);
+drop table temp_bench;
diff --git a/src/test/bench/query02 b/src/test/bench/query02
index 2d253ac1efa18a636f61b11c83be6736acea5ec8..e7b4f388185c7a6698463f7e4d256853676b811a 100644
--- a/src/test/bench/query02
+++ b/src/test/bench/query02
@@ -1,4 +1,4 @@
-select * into table temp from tenk1 where (unique1 > 647) and (unique1 < 1648);
-drop table temp;
-select * into table temp from tenk1 where (unique1 > 647) and (unique1 < 1648);
-drop table temp;
+select * into table temp_bench from tenk1 where (unique1 > 647) and (unique1 < 1648);
+drop table temp_bench;
+select * into table temp_bench from tenk1 where (unique1 > 647) and (unique1 < 1648);
+drop table temp_bench;
diff --git a/src/test/bench/query03 b/src/test/bench/query03
index 0ed3a7b1e58ffad24838ef553cf0b9596a96f316..07050b6cc787de1ad4de4b30313346a22a2a4174 100644
--- a/src/test/bench/query03
+++ b/src/test/bench/query03
@@ -1,4 +1,4 @@
-select * into table temp from tenk1 where (unique2 > 301) and (unique2 < 402);
-drop table temp;
-select * into table temp from tenk1 where (unique2 > 301) and (unique2 < 402);
-drop table temp;
+select * into table temp_bench from tenk1 where (unique2 > 301) and (unique2 < 402);
+drop table temp_bench;
+select * into table temp_bench from tenk1 where (unique2 > 301) and (unique2 < 402);
+drop table temp_bench;
diff --git a/src/test/bench/query04 b/src/test/bench/query04
index 2d253ac1efa18a636f61b11c83be6736acea5ec8..e7b4f388185c7a6698463f7e4d256853676b811a 100644
--- a/src/test/bench/query04
+++ b/src/test/bench/query04
@@ -1,4 +1,4 @@
-select * into table temp from tenk1 where (unique1 > 647) and (unique1 < 1648);
-drop table temp;
-select * into table temp from tenk1 where (unique1 > 647) and (unique1 < 1648);
-drop table temp;
+select * into table temp_bench from tenk1 where (unique1 > 647) and (unique1 < 1648);
+drop table temp_bench;
+select * into table temp_bench from tenk1 where (unique1 > 647) and (unique1 < 1648);
+drop table temp_bench;
diff --git a/src/test/bench/query05 b/src/test/bench/query05
index 0ed3a7b1e58ffad24838ef553cf0b9596a96f316..07050b6cc787de1ad4de4b30313346a22a2a4174 100644
--- a/src/test/bench/query05
+++ b/src/test/bench/query05
@@ -1,4 +1,4 @@
-select * into table temp from tenk1 where (unique2 > 301) and (unique2 < 402);
-drop table temp;
-select * into table temp from tenk1 where (unique2 > 301) and (unique2 < 402);
-drop table temp;
+select * into table temp_bench from tenk1 where (unique2 > 301) and (unique2 < 402);
+drop table temp_bench;
+select * into table temp_bench from tenk1 where (unique2 > 301) and (unique2 < 402);
+drop table temp_bench;
diff --git a/src/test/bench/query06 b/src/test/bench/query06
index 209c1321e60b21b74fa18835fe8c314abef48efe..01b382f0b818e30c98a9cfb3cee6dbaaa502b655 100644
--- a/src/test/bench/query06
+++ b/src/test/bench/query06
@@ -1,4 +1,4 @@
-select * into table temp from tenk1 where (unique2 > 647) and (unique2 < 1648);
-drop table temp;
-select * into table temp from tenk1 where (unique2 > 647) and (unique2 < 1648);
-drop table temp;
+select * into table temp_bench from tenk1 where (unique2 > 647) and (unique2 < 1648);
+drop table temp_bench;
+select * into table temp_bench from tenk1 where (unique2 > 647) and (unique2 < 1648);
+drop table temp_bench;
diff --git a/src/test/bench/query09 b/src/test/bench/query09
index 66d33ca1ad4c9816ff659254cf7036ed1eb6ecbd..c33ce342b5f7b901a3508cd27677f03925f98344 100644
--- a/src/test/bench/query09
+++ b/src/test/bench/query09
@@ -1,4 +1,4 @@
-select t1.*, t2.unique1 AS t2unique1, t2.unique2 AS t2unique2, t2.two AS t2two, t2.four AS t2four, t2.ten AS t2ten, t2.twenty AS t2twenty, t2.hundred AS t2hundred, t2.thousand AS t2thousand, t2.twothousand AS t2twothousand, t2.fivethous AS t2fivethous, t2.tenthous AS t2tenthous, t2.odd AS t2odd, t2.even AS t2even, t2.stringu1 AS t2stringu1, t2.stringu2 AS t2stringu2, t2.string4 AS t2string4 into table temp from tenk1 t1, tenk1 t2 where (t1.unique2 = t2.unique2) and (t2.unique2 < 1000);
-drop table temp;
-select t1.*, t2.unique1 AS t2unique1, t2.unique2 AS t2unique2, t2.two AS t2two, t2.four AS t2four, t2.ten AS t2ten, t2.twenty AS t2twenty, t2.hundred AS t2hundred, t2.thousand AS t2thousand, t2.twothousand AS t2twothousand, t2.fivethous AS t2fivethous, t2.tenthous AS t2tenthous, t2.odd AS t2odd, t2.even AS t2even, t2.stringu1 AS t2stringu1, t2.stringu2 AS t2stringu2, t2.string4 AS t2string4 into table temp from tenk1 t1, tenk1 t2 where (t1.unique2 = t2.unique2) and (t2.unique2 < 1000);
-drop table temp;
+select t1.*, t2.unique1 AS t2unique1, t2.unique2 AS t2unique2, t2.two AS t2two, t2.four AS t2four, t2.ten AS t2ten, t2.twenty AS t2twenty, t2.hundred AS t2hundred, t2.thousand AS t2thousand, t2.twothousand AS t2twothousand, t2.fivethous AS t2fivethous, t2.tenthous AS t2tenthous, t2.odd AS t2odd, t2.even AS t2even, t2.stringu1 AS t2stringu1, t2.stringu2 AS t2stringu2, t2.string4 AS t2string4 into table temp_bench from tenk1 t1, tenk1 t2 where (t1.unique2 = t2.unique2) and (t2.unique2 < 1000);
+drop table temp_bench;
+select t1.*, t2.unique1 AS t2unique1, t2.unique2 AS t2unique2, t2.two AS t2two, t2.four AS t2four, t2.ten AS t2ten, t2.twenty AS t2twenty, t2.hundred AS t2hundred, t2.thousand AS t2thousand, t2.twothousand AS t2twothousand, t2.fivethous AS t2fivethous, t2.tenthous AS t2tenthous, t2.odd AS t2odd, t2.even AS t2even, t2.stringu1 AS t2stringu1, t2.stringu2 AS t2stringu2, t2.string4 AS t2string4 into table temp_bench from tenk1 t1, tenk1 t2 where (t1.unique2 = t2.unique2) and (t2.unique2 < 1000);
+drop table temp_bench;
diff --git a/src/test/bench/query10 b/src/test/bench/query10
index de372aa64728fa1ab7d9e324b94433c896d5371b..c937a60b453a47e1afccd5ade13631ac619cb45a 100644
--- a/src/test/bench/query10
+++ b/src/test/bench/query10
@@ -1,4 +1,4 @@
-select t.*,B.unique1 AS Bunique1,B.unique2 AS Bunique2,B.two AS Btwo,B.four AS Bfour,B.ten AS Bten,B.twenty AS Btwenty,B.hundred AS Bhundred,B.thousand AS Bthousand,B.twothousand AS Btwothousand,B.fivethous AS Bfivethous,B.tenthous AS Btenthous,B.odd AS Bodd,B.even AS Beven,B.stringu1 AS Bstringu1,B.stringu2 AS Bstringu2,B.string4 AS Bstring4 into table temp from tenk1 t, Bprime B where t.unique2 = B.unique2;
-drop table temp;
-select t.*,B.unique1 AS Bunique1,B.unique2 AS Bunique2,B.two AS Btwo,B.four AS Bfour,B.ten AS Bten,B.twenty AS Btwenty,B.hundred AS Bhundred,B.thousand AS Bthousand,B.twothousand AS Btwothousand,B.fivethous AS Bfivethous,B.tenthous AS Btenthous,B.odd AS Bodd,B.even AS Beven,B.stringu1 AS Bstringu1,B.stringu2 AS Bstringu2,B.string4 AS Bstring4 into table temp from tenk1 t, Bprime B where t.unique2 = B.unique2;
-drop table temp;
+select t.*,B.unique1 AS Bunique1,B.unique2 AS Bunique2,B.two AS Btwo,B.four AS Bfour,B.ten AS Bten,B.twenty AS Btwenty,B.hundred AS Bhundred,B.thousand AS Bthousand,B.twothousand AS Btwothousand,B.fivethous AS Bfivethous,B.tenthous AS Btenthous,B.odd AS Bodd,B.even AS Beven,B.stringu1 AS Bstringu1,B.stringu2 AS Bstringu2,B.string4 AS Bstring4 into table temp_bench from tenk1 t, Bprime B where t.unique2 = B.unique2;
+drop table temp_bench;
+select t.*,B.unique1 AS Bunique1,B.unique2 AS Bunique2,B.two AS Btwo,B.four AS Bfour,B.ten AS Bten,B.twenty AS Btwenty,B.hundred AS Bhundred,B.thousand AS Bthousand,B.twothousand AS Btwothousand,B.fivethous AS Bfivethous,B.tenthous AS Btenthous,B.odd AS Bodd,B.even AS Beven,B.stringu1 AS Bstringu1,B.stringu2 AS Bstringu2,B.string4 AS Bstring4 into table temp_bench from tenk1 t, Bprime B where t.unique2 = B.unique2;
+drop table temp_bench;
diff --git a/src/test/bench/query11 b/src/test/bench/query11
index abbce829a84085f6afa9c484d3557c80ede87bf2..4f6013ebc1cb7b1e6dd846a0cee8dc66e9b47f33 100644
--- a/src/test/bench/query11
+++ b/src/test/bench/query11
@@ -1,4 +1,4 @@
-select t1.*,o.unique1 AS ounique1,o.unique2 AS ounique2,o.two AS otwo,o.four AS ofour,o.ten AS oten,o.twenty AS otwenty,o.hundred AS ohundred,o.thousand AS othousand,o.twothousand AS otwothousand,o.fivethous AS ofivethous,o.tenthous AS otenthous,o.odd AS oodd, o.even AS oeven,o.stringu1 AS ostringu1,o.stringu2 AS ostringu2,o.string4 AS ostring4 into table temp from onek o, tenk1 t1, tenk1 t2 where (o.unique2 = t1.unique2) and (t1.unique2 = t2.unique2) and (t1.unique2 < 1000) and (t2.unique2 < 1000);
-drop table temp;
-select t1.*,o.unique1 AS ounique1,o.unique2 AS ounique2,o.two AS otwo,o.four AS ofour,o.ten AS oten,o.twenty AS otwenty,o.hundred AS ohundred,o.thousand AS othousand,o.twothousand AS otwothousand,o.fivethous AS ofivethous,o.tenthous AS otenthous,o.odd AS oodd, o.even AS oeven,o.stringu1 AS ostringu1,o.stringu2 AS ostringu2,o.string4 AS ostring4 into table temp from onek o, tenk1 t1, tenk1 t2 where (o.unique2 = t1.unique2) and (t1.unique2 = t2.unique2) and (t1.unique2 < 1000) and (t2.unique2 < 1000);
-drop table temp;
+select t1.*,o.unique1 AS ounique1,o.unique2 AS ounique2,o.two AS otwo,o.four AS ofour,o.ten AS oten,o.twenty AS otwenty,o.hundred AS ohundred,o.thousand AS othousand,o.twothousand AS otwothousand,o.fivethous AS ofivethous,o.tenthous AS otenthous,o.odd AS oodd, o.even AS oeven,o.stringu1 AS ostringu1,o.stringu2 AS ostringu2,o.string4 AS ostring4 into table temp_bench from onek o, tenk1 t1, tenk1 t2 where (o.unique2 = t1.unique2) and (t1.unique2 = t2.unique2) and (t1.unique2 < 1000) and (t2.unique2 < 1000);
+drop table temp_bench;
+select t1.*,o.unique1 AS ounique1,o.unique2 AS ounique2,o.two AS otwo,o.four AS ofour,o.ten AS oten,o.twenty AS otwenty,o.hundred AS ohundred,o.thousand AS othousand,o.twothousand AS otwothousand,o.fivethous AS ofivethous,o.tenthous AS otenthous,o.odd AS oodd, o.even AS oeven,o.stringu1 AS ostringu1,o.stringu2 AS ostringu2,o.string4 AS ostring4 into table temp_bench from onek o, tenk1 t1, tenk1 t2 where (o.unique2 = t1.unique2) and (t1.unique2 = t2.unique2) and (t1.unique2 < 1000) and (t2.unique2 < 1000);
+drop table temp_bench;
diff --git a/src/test/bench/query12 b/src/test/bench/query12
index d1b4611feea078ea7857d33c0c5b981a89232a2a..f601c24ddbcf9280f05e8ac414652bf06eeea383 100644
--- a/src/test/bench/query12
+++ b/src/test/bench/query12
@@ -1,4 +1,4 @@
-select t1.*,t2.unique1 AS t2unique1,t2.unique2 AS t2unique2,t2.two AS t2two, t2.four AS t2four,t2.ten AS t2ten,t2.twenty AS t2twenty,t2.hundred AS t2hundred,t2.thousand AS t2thousand,t2.twothousand AS t2twothousand, t2.fivethous AS t2fivethous,t2.tenthous AS t2tenthous,t2.odd AS t2odd, t2.even AS t2even,t2.stringu1 AS t2stringu1,t2.stringu2 AS t2stringu2, t2.string4 AS t2string4 into table temp from tenk1 t1, tenk2 t2 where (t1.unique2 = t2.unique2) and (t2.unique2 < 1000);
-drop table temp;
-select t1.*,t2.unique1 AS t2unique1,t2.unique2 AS t2unique2,t2.two AS t2two, t2.four AS t2four,t2.ten AS t2ten,t2.twenty AS t2twenty,t2.hundred AS t2hundred,t2.thousand AS t2thousand,t2.twothousand AS t2twothousand, t2.fivethous AS t2fivethous,t2.tenthous AS t2tenthous,t2.odd AS t2odd, t2.even AS t2even,t2.stringu1 AS t2stringu1,t2.stringu2 AS t2stringu2, t2.string4 AS t2string4 into table temp from tenk1 t1, tenk2 t2 where (t1.unique2 = t2.unique2) and (t2.unique2 < 1000);
-drop table temp;
+select t1.*,t2.unique1 AS t2unique1,t2.unique2 AS t2unique2,t2.two AS t2two, t2.four AS t2four,t2.ten AS t2ten,t2.twenty AS t2twenty,t2.hundred AS t2hundred,t2.thousand AS t2thousand,t2.twothousand AS t2twothousand, t2.fivethous AS t2fivethous,t2.tenthous AS t2tenthous,t2.odd AS t2odd, t2.even AS t2even,t2.stringu1 AS t2stringu1,t2.stringu2 AS t2stringu2, t2.string4 AS t2string4 into table temp_bench from tenk1 t1, tenk2 t2 where (t1.unique2 = t2.unique2) and (t2.unique2 < 1000);
+drop table temp_bench;
+select t1.*,t2.unique1 AS t2unique1,t2.unique2 AS t2unique2,t2.two AS t2two, t2.four AS t2four,t2.ten AS t2ten,t2.twenty AS t2twenty,t2.hundred AS t2hundred,t2.thousand AS t2thousand,t2.twothousand AS t2twothousand, t2.fivethous AS t2fivethous,t2.tenthous AS t2tenthous,t2.odd AS t2odd, t2.even AS t2even,t2.stringu1 AS t2stringu1,t2.stringu2 AS t2stringu2, t2.string4 AS t2string4 into table temp_bench from tenk1 t1, tenk2 t2 where (t1.unique2 = t2.unique2) and (t2.unique2 < 1000);
+drop table temp_bench;
diff --git a/src/test/bench/query13 b/src/test/bench/query13
index de372aa64728fa1ab7d9e324b94433c896d5371b..c937a60b453a47e1afccd5ade13631ac619cb45a 100644
--- a/src/test/bench/query13
+++ b/src/test/bench/query13
@@ -1,4 +1,4 @@
-select t.*,B.unique1 AS Bunique1,B.unique2 AS Bunique2,B.two AS Btwo,B.four AS Bfour,B.ten AS Bten,B.twenty AS Btwenty,B.hundred AS Bhundred,B.thousand AS Bthousand,B.twothousand AS Btwothousand,B.fivethous AS Bfivethous,B.tenthous AS Btenthous,B.odd AS Bodd,B.even AS Beven,B.stringu1 AS Bstringu1,B.stringu2 AS Bstringu2,B.string4 AS Bstring4 into table temp from tenk1 t, Bprime B where t.unique2 = B.unique2;
-drop table temp;
-select t.*,B.unique1 AS Bunique1,B.unique2 AS Bunique2,B.two AS Btwo,B.four AS Bfour,B.ten AS Bten,B.twenty AS Btwenty,B.hundred AS Bhundred,B.thousand AS Bthousand,B.twothousand AS Btwothousand,B.fivethous AS Bfivethous,B.tenthous AS Btenthous,B.odd AS Bodd,B.even AS Beven,B.stringu1 AS Bstringu1,B.stringu2 AS Bstringu2,B.string4 AS Bstring4 into table temp from tenk1 t, Bprime B where t.unique2 = B.unique2;
-drop table temp;
+select t.*,B.unique1 AS Bunique1,B.unique2 AS Bunique2,B.two AS Btwo,B.four AS Bfour,B.ten AS Bten,B.twenty AS Btwenty,B.hundred AS Bhundred,B.thousand AS Bthousand,B.twothousand AS Btwothousand,B.fivethous AS Bfivethous,B.tenthous AS Btenthous,B.odd AS Bodd,B.even AS Beven,B.stringu1 AS Bstringu1,B.stringu2 AS Bstringu2,B.string4 AS Bstring4 into table temp_bench from tenk1 t, Bprime B where t.unique2 = B.unique2;
+drop table temp_bench;
+select t.*,B.unique1 AS Bunique1,B.unique2 AS Bunique2,B.two AS Btwo,B.four AS Bfour,B.ten AS Bten,B.twenty AS Btwenty,B.hundred AS Bhundred,B.thousand AS Bthousand,B.twothousand AS Btwothousand,B.fivethous AS Bfivethous,B.tenthous AS Btenthous,B.odd AS Bodd,B.even AS Beven,B.stringu1 AS Bstringu1,B.stringu2 AS Bstringu2,B.string4 AS Bstring4 into table temp_bench from tenk1 t, Bprime B where t.unique2 = B.unique2;
+drop table temp_bench;
diff --git a/src/test/bench/query14 b/src/test/bench/query14
index abbce829a84085f6afa9c484d3557c80ede87bf2..4f6013ebc1cb7b1e6dd846a0cee8dc66e9b47f33 100644
--- a/src/test/bench/query14
+++ b/src/test/bench/query14
@@ -1,4 +1,4 @@
-select t1.*,o.unique1 AS ounique1,o.unique2 AS ounique2,o.two AS otwo,o.four AS ofour,o.ten AS oten,o.twenty AS otwenty,o.hundred AS ohundred,o.thousand AS othousand,o.twothousand AS otwothousand,o.fivethous AS ofivethous,o.tenthous AS otenthous,o.odd AS oodd, o.even AS oeven,o.stringu1 AS ostringu1,o.stringu2 AS ostringu2,o.string4 AS ostring4 into table temp from onek o, tenk1 t1, tenk1 t2 where (o.unique2 = t1.unique2) and (t1.unique2 = t2.unique2) and (t1.unique2 < 1000) and (t2.unique2 < 1000);
-drop table temp;
-select t1.*,o.unique1 AS ounique1,o.unique2 AS ounique2,o.two AS otwo,o.four AS ofour,o.ten AS oten,o.twenty AS otwenty,o.hundred AS ohundred,o.thousand AS othousand,o.twothousand AS otwothousand,o.fivethous AS ofivethous,o.tenthous AS otenthous,o.odd AS oodd, o.even AS oeven,o.stringu1 AS ostringu1,o.stringu2 AS ostringu2,o.string4 AS ostring4 into table temp from onek o, tenk1 t1, tenk1 t2 where (o.unique2 = t1.unique2) and (t1.unique2 = t2.unique2) and (t1.unique2 < 1000) and (t2.unique2 < 1000);
-drop table temp;
+select t1.*,o.unique1 AS ounique1,o.unique2 AS ounique2,o.two AS otwo,o.four AS ofour,o.ten AS oten,o.twenty AS otwenty,o.hundred AS ohundred,o.thousand AS othousand,o.twothousand AS otwothousand,o.fivethous AS ofivethous,o.tenthous AS otenthous,o.odd AS oodd, o.even AS oeven,o.stringu1 AS ostringu1,o.stringu2 AS ostringu2,o.string4 AS ostring4 into table temp_bench from onek o, tenk1 t1, tenk1 t2 where (o.unique2 = t1.unique2) and (t1.unique2 = t2.unique2) and (t1.unique2 < 1000) and (t2.unique2 < 1000);
+drop table temp_bench;
+select t1.*,o.unique1 AS ounique1,o.unique2 AS ounique2,o.two AS otwo,o.four AS ofour,o.ten AS oten,o.twenty AS otwenty,o.hundred AS ohundred,o.thousand AS othousand,o.twothousand AS otwothousand,o.fivethous AS ofivethous,o.tenthous AS otenthous,o.odd AS oodd, o.even AS oeven,o.stringu1 AS ostringu1,o.stringu2 AS ostringu2,o.string4 AS ostring4 into table temp_bench from onek o, tenk1 t1, tenk1 t2 where (o.unique2 = t1.unique2) and (t1.unique2 = t2.unique2) and (t1.unique2 < 1000) and (t2.unique2 < 1000);
+drop table temp_bench;
diff --git a/src/test/bench/query15 b/src/test/bench/query15
index be5fb5b45f7b368696bae98311e4aaf1a8cc9c4f..78192121e5edbbc0373bd5886f6f4f33cd056e12 100644
--- a/src/test/bench/query15
+++ b/src/test/bench/query15
@@ -1,4 +1,4 @@
-select t1.*, t2.unique1 AS t2unique1, t2.unique2 AS t2unique2, t2.two AS t2two, t2.four AS t2four, t2.ten AS t2ten, t2.twenty AS t2twenty, t2.hundred AS t2hundred, t2.thousand AS t2thousand,t2.twothousand AS t2twothousand, t2.fivethous AS t2fivethous, t2.tenthous AS t2tenthous, t2.odd AS t2odd, t2.even AS t2even, t2.stringu1 AS t2stringu1, t2.stringu2 AS t2stringu2, t2.string4 AS t2string4 into table temp from tenk1 t1, tenk2 t2 where (t1.unique1 = t2.unique1) and (t2.unique1 < 1000);
-drop table temp;
-select t1.*, t2.unique1 AS t2unique1, t2.unique2 AS t2unique2, t2.two AS t2two, t2.four AS t2four, t2.ten AS t2ten, t2.twenty AS t2twenty, t2.hundred AS t2hundred, t2.thousand AS t2thousand,t2.twothousand AS t2twothousand, t2.fivethous AS t2fivethous, t2.tenthous AS t2tenthous, t2.odd AS t2odd, t2.even AS t2even, t2.stringu1 AS t2stringu1, t2.stringu2 AS t2stringu2, t2.string4 AS t2string4 into table temp from tenk1 t1, tenk2 t2 where (t1.unique1 = t2.unique1) and (t2.unique1 < 1000);
-drop table temp;
+select t1.*, t2.unique1 AS t2unique1, t2.unique2 AS t2unique2, t2.two AS t2two, t2.four AS t2four, t2.ten AS t2ten, t2.twenty AS t2twenty, t2.hundred AS t2hundred, t2.thousand AS t2thousand,t2.twothousand AS t2twothousand, t2.fivethous AS t2fivethous, t2.tenthous AS t2tenthous, t2.odd AS t2odd, t2.even AS t2even, t2.stringu1 AS t2stringu1, t2.stringu2 AS t2stringu2, t2.string4 AS t2string4 into table temp_bench from tenk1 t1, tenk2 t2 where (t1.unique1 = t2.unique1) and (t2.unique1 < 1000);
+drop table temp_bench;
+select t1.*, t2.unique1 AS t2unique1, t2.unique2 AS t2unique2, t2.two AS t2two, t2.four AS t2four, t2.ten AS t2ten, t2.twenty AS t2twenty, t2.hundred AS t2hundred, t2.thousand AS t2thousand,t2.twothousand AS t2twothousand, t2.fivethous AS t2fivethous, t2.tenthous AS t2tenthous, t2.odd AS t2odd, t2.even AS t2even, t2.stringu1 AS t2stringu1, t2.stringu2 AS t2stringu2, t2.string4 AS t2string4 into table temp_bench from tenk1 t1, tenk2 t2 where (t1.unique1 = t2.unique1) and (t2.unique1 < 1000);
+drop table temp_bench;
diff --git a/src/test/bench/query16 b/src/test/bench/query16
index 6e366490309f779f49b4881e7a2867c5e7e2870e..39e64895c650e4be597522bbf6ae76a03ef9231a 100644
--- a/src/test/bench/query16
+++ b/src/test/bench/query16
@@ -1,4 +1,4 @@
-select t.*, B.unique1 AS Bunique1,B.unique2 AS Bunique2,B.two AS Btwo,B.four AS Bfour,B.ten AS Bten, B.twenty AS Btwenty, B.hundred AS Bhundred,B.thousand AS Bthousand,B.twothousand AS Btwothousand, B.fivethous AS Bfivethous,B.tenthous AS Btenthous,B.odd AS Bodd, B.even AS Beven,B.stringu1 AS Bstringu1,B.stringu2 AS Bstringu2,B.string4 AS Bstring4 into table temp  from tenk1 t, Bprime B where t.unique1 = B.unique1;
-drop table temp;
-select t.*, B.unique1 AS Bunique1,B.unique2 AS Bunique2,B.two AS Btwo,B.four AS Bfour,B.ten AS Bten, B.twenty AS Btwenty, B.hundred AS Bhundred,B.thousand AS Bthousand,B.twothousand AS Btwothousand, B.fivethous AS Bfivethous,B.tenthous AS Btenthous,B.odd AS Bodd, B.even AS Beven,B.stringu1 AS Bstringu1,B.stringu2 AS Bstringu2,B.string4 AS Bstring4 into table temp  from tenk1 t, Bprime B where t.unique1 = B.unique1;
-drop table temp;
+select t.*, B.unique1 AS Bunique1,B.unique2 AS Bunique2,B.two AS Btwo,B.four AS Bfour,B.ten AS Bten, B.twenty AS Btwenty, B.hundred AS Bhundred,B.thousand AS Bthousand,B.twothousand AS Btwothousand, B.fivethous AS Bfivethous,B.tenthous AS Btenthous,B.odd AS Bodd, B.even AS Beven,B.stringu1 AS Bstringu1,B.stringu2 AS Bstringu2,B.string4 AS Bstring4 into table temp_bench  from tenk1 t, Bprime B where t.unique1 = B.unique1;
+drop table temp_bench;
+select t.*, B.unique1 AS Bunique1,B.unique2 AS Bunique2,B.two AS Btwo,B.four AS Bfour,B.ten AS Bten, B.twenty AS Btwenty, B.hundred AS Bhundred,B.thousand AS Bthousand,B.twothousand AS Btwothousand, B.fivethous AS Bfivethous,B.tenthous AS Btenthous,B.odd AS Bodd, B.even AS Beven,B.stringu1 AS Bstringu1,B.stringu2 AS Bstringu2,B.string4 AS Bstring4 into table temp_bench  from tenk1 t, Bprime B where t.unique1 = B.unique1;
+drop table temp_bench;
diff --git a/src/test/bench/query17 b/src/test/bench/query17
index e3b501ba3ff3554255377c6cebbb95b1a5dabb6a..0b8e0a590c89dcbf05d4ebc5f4c487de095f2de1 100644
--- a/src/test/bench/query17
+++ b/src/test/bench/query17
@@ -1,4 +1,4 @@
-select t1.*, o.unique1 AS ounique1,o.unique2 AS ounique2,o.two AS otwo,o.four AS ofour,o.ten AS oten,o.twenty AS otwenty,o.hundred AS  ohundred,o.thousand AS othousand,o.twothousand AS otwothousand,o.fivethous AS ofivethous,o.tenthous AS otenthous,o.odd AS oodd, o.even AS oeven,o.stringu1 AS ostringu1,o.stringu2 AS ostringu2,o.string4 AS ostring4 into table temp from onek o, tenk1 t1, tenk2 t2 where (o.unique1 = t1.unique1) and (t1.unique1 = t2.unique1) and (t1.unique1 < 1000) and (t2.unique1 < 1000);
-drop table temp;
-select t1.*, o.unique1 AS ounique1,o.unique2 AS ounique2,o.two AS otwo,o.four AS ofour,o.ten AS oten,o.twenty AS otwenty,o.hundred AS  ohundred,o.thousand AS othousand,o.twothousand AS otwothousand,o.fivethous AS ofivethous,o.tenthous AS otenthous,o.odd AS oodd, o.even AS oeven,o.stringu1 AS ostringu1,o.stringu2 AS ostringu2,o.string4 AS ostring4 into table temp from onek o, tenk1 t1, tenk2 t2 where (o.unique1 = t1.unique1) and (t1.unique1 = t2.unique1) and (t1.unique1 < 1000) and (t2.unique1 < 1000);
-drop table temp;
+select t1.*, o.unique1 AS ounique1,o.unique2 AS ounique2,o.two AS otwo,o.four AS ofour,o.ten AS oten,o.twenty AS otwenty,o.hundred AS  ohundred,o.thousand AS othousand,o.twothousand AS otwothousand,o.fivethous AS ofivethous,o.tenthous AS otenthous,o.odd AS oodd, o.even AS oeven,o.stringu1 AS ostringu1,o.stringu2 AS ostringu2,o.string4 AS ostring4 into table temp_bench from onek o, tenk1 t1, tenk2 t2 where (o.unique1 = t1.unique1) and (t1.unique1 = t2.unique1) and (t1.unique1 < 1000) and (t2.unique1 < 1000);
+drop table temp_bench;
+select t1.*, o.unique1 AS ounique1,o.unique2 AS ounique2,o.two AS otwo,o.four AS ofour,o.ten AS oten,o.twenty AS otwenty,o.hundred AS  ohundred,o.thousand AS othousand,o.twothousand AS otwothousand,o.fivethous AS ofivethous,o.tenthous AS otenthous,o.odd AS oodd, o.even AS oeven,o.stringu1 AS ostringu1,o.stringu2 AS ostringu2,o.string4 AS ostring4 into table temp_bench from onek o, tenk1 t1, tenk2 t2 where (o.unique1 = t1.unique1) and (t1.unique1 = t2.unique1) and (t1.unique1 < 1000) and (t2.unique1 < 1000);
+drop table temp_bench;
diff --git a/src/test/bench/query18 b/src/test/bench/query18
index 92fe5f79b2d27bb66aa80fb84bc8484efb4053fc..4a793a9291d706e3edf4553fd7a7aa0472178a29 100644
--- a/src/test/bench/query18
+++ b/src/test/bench/query18
@@ -1,4 +1,4 @@
-select two, four, ten, twenty, hundred, string4 into table temp from tenk1;
-drop table temp;
-select two, four, ten, twenty, hundred, string4 into table temp from tenk1;
-drop table temp;
+select two, four, ten, twenty, hundred, string4 into table temp_bench from tenk1;
+drop table temp_bench;
+select two, four, ten, twenty, hundred, string4 into table temp_bench from tenk1;
+drop table temp_bench;
diff --git a/src/test/bench/query19 b/src/test/bench/query19
index 1ed160d7ab840c3c458c969dfcf46a59b9890c27..c75ab3fd46ddc9157fb84f3ed7575ef403f3ff28 100644
--- a/src/test/bench/query19
+++ b/src/test/bench/query19
@@ -1,4 +1,4 @@
-select * into table temp from onek;
-drop table temp;
-select * into table temp from onek;
-drop table temp;
+select * into table temp_bench from onek;
+drop table temp_bench;
+select * into table temp_bench from onek;
+drop table temp_bench;
diff --git a/src/test/bench/query20 b/src/test/bench/query20
index e544ea63f495f4f6a06f67a0a438cd1c802a88e7..db7568dff76200f66a8c19aec67cb0cd5aac459b 100644
--- a/src/test/bench/query20
+++ b/src/test/bench/query20
@@ -1,4 +1,4 @@
-select int4min(unique2) as x into table temp from tenk1;
-drop table temp;
-select int4min(unique2) as x into table temp from tenk1;
-drop table temp;
+select min(unique2) as x into table temp_bench from tenk1;
+drop table temp_bench;
+select min(unique2) as x into table temp_bench from tenk1;
+drop table temp_bench;
diff --git a/src/test/bench/query23 b/src/test/bench/query23
index e544ea63f495f4f6a06f67a0a438cd1c802a88e7..db7568dff76200f66a8c19aec67cb0cd5aac459b 100644
--- a/src/test/bench/query23
+++ b/src/test/bench/query23
@@ -1,4 +1,4 @@
-select int4min(unique2) as x into table temp from tenk1;
-drop table temp;
-select int4min(unique2) as x into table temp from tenk1;
-drop table temp;
+select min(unique2) as x into table temp_bench from tenk1;
+drop table temp_bench;
+select min(unique2) as x into table temp_bench from tenk1;
+drop table temp_bench;
diff --git a/src/test/bench/query26 b/src/test/bench/query26
index 715c4c374410d7fc2a649a7d738917e8dd59d39d..32dedf054c897c6a05ecf3bf8948f21feb391dd5 100644
--- a/src/test/bench/query26
+++ b/src/test/bench/query26
@@ -1,2 +1,2 @@
-insert into tenk1 (unique1, unique2, two, four, ten, twenty, hundred, thousand, twothousand, fivethous, tenthous, odd, even,stringu1,stringu2, string4) values (1000, 74, 0, 2, 0, 10, 50, 688, 1950, 4950, 9950, 1, 100, "ron may choi","jae kwang choi", "u. c. berkeley");
-insert into tenk1 (unique1, unique2, two, four, ten, twenty, hundred, thousand, twothousand, fivethous, tenthous, odd, even, stringu1, stringu2, string4) values (1999, 60, 0, 2, 0, 10, 50, 688, 1950, 4950, 9950, 1, 100, "ron may choi", "jae kwang choi", "u. c. berkeley");
+insert into tenk1 (unique1, unique2, two, four, ten, twenty, hundred, thousand, twothousand, fivethous, tenthous, odd, even,stringu1,stringu2, string4) values (1000, 74, 0, 2, 0, 10, 50, 688, 1950, 4950, 9950, 1, 100, 'ron may choi','jae kwang choi', 'u. c. berkeley');
+insert into tenk1 (unique1, unique2, two, four, ten, twenty, hundred, thousand, twothousand, fivethous, tenthous, odd, even, stringu1, stringu2, string4) values (1999, 60, 0, 2, 0, 10, 50, 688, 1950, 4950, 9950, 1, 100, 'ron may choi', 'jae kwang choi', 'u. c. berkeley');
diff --git a/src/test/bench/query29 b/src/test/bench/query29
index 3600685c6a58b3d93432a81df07c200624375562..f6a715b229f4b5a8e6f8f8b0e9c8801db4265446 100644
--- a/src/test/bench/query29
+++ b/src/test/bench/query29
@@ -1,2 +1,2 @@
-insert into tenk1 (unique1, unique2, two, four, ten, twenty, hundred, thousand, twothousand, fivethous, tenthous, odd, even, stringu1, stringu2, string4) values (1000, 70, 0, 2, 0, 10, 50, 688, 1950, 4950, 9950, 1, 100, "ron may choi", "jae kwang choi", "u. c. berkeley");
-insert into tenk1 (unique1, unique2, two, four, ten, twenty, hundred, thousand, twothousand, fivethous, tenthous, odd, even, stringu1, stringu2, string4) values (500, 40, 0, 2, 0, 10, 50, 688, 1950, 4950, 9950, 1, 100, "ron may choi", "jae kwang choi", "u. c. berkeley");
+insert into tenk1 (unique1, unique2, two, four, ten, twenty, hundred, thousand, twothousand, fivethous, tenthous, odd, even, stringu1, stringu2, string4) values (1000, 70, 0, 2, 0, 10, 50, 688, 1950, 4950, 9950, 1, 100, 'ron may choi', 'jae kwang choi', 'u. c. berkeley');
+insert into tenk1 (unique1, unique2, two, four, ten, twenty, hundred, thousand, twothousand, fivethous, tenthous, odd, even, stringu1, stringu2, string4) values (500, 40, 0, 2, 0, 10, 50, 688, 1950, 4950, 9950, 1, 100, 'ron may choi', 'jae kwang choi', 'u. c. berkeley');
diff --git a/src/test/bench/runwisc.sh b/src/test/bench/runwisc.sh
index 50bf3532fa653b578b6b741fd79b6ec1a34f004b..8ddce2e3a6998abf393cf2b4aebc5a507dce314e 100755
--- a/src/test/bench/runwisc.sh
+++ b/src/test/bench/runwisc.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Header: /cvsroot/pgsql/src/test/bench/Attic/runwisc.sh,v 1.2 1997/04/17 13:48:52 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/test/bench/Attic/runwisc.sh,v 1.3 1999/04/16 06:31:13 ishii Exp $
 # 
 # Note that in our published benchmark numbers, we executed the command in the
 # following fashion:
@@ -19,4 +19,4 @@ echo =============== vacuuming benchmark database... =================
 echo "vacuum" | postgres -D${1} -Q bench > /dev/null
 
 echo =============== running benchmark... =================
-time postgres -D${1} -texecutor -tplanner -Q bench < bench.sql
+time postgres -D${1} -B 256 -texecutor -tplanner -Q bench < bench.sql