Fixed bug in send in mysqltest

Removed usage of @r/result as this made life hard when testing different
table handlers.
Allow concurrent inserts if no update/binary log.
Don't remove key_cache at flush tables.
Fixed bug in SELECT DISTINCT SUM()...


BitKeeper/deleted/.del-rpl000012.status.result~bbbd650b5beea32f:
  Delete: mysql-test/r/rpl000012.status.result
BitKeeper/deleted/.del-rpl000013.status.result~6bee190c298cc9fd:
  Delete: mysql-test/r/rpl000013.status.result
Docs/manual.texi:
  Changelog
client/mysqltest.c:
  Fixed bug in 'send' that Sasha had introduced.
  Make database, port and socket optional parameters to connect()
mysql-test/r/rpl000005.result:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/r/rpl000006.result:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/r/rpl000012.result:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/r/rpl000013.result:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/r/sel000033.result:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/t/backup.test:
  Use default port and socket.
mysql-test/t/dirty-close.test:
  Use default port and socket.
mysql-test/t/flush.test:
  Use default port and socket.
mysql-test/t/kill.test:
  Use default port and socket.
mysql-test/t/overflow.test:
  Use default port and socket.
mysql-test/t/rpl000003.test:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/t/rpl000005.test:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/t/rpl000006.test:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/t/rpl000007.test:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/t/rpl000008.test:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/t/rpl000009.test:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/t/rpl000010.test:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/t/rpl000011.test:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/t/rpl000012.test:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/t/rpl000013.test:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/t/sel000001.test:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/t/sel000002.test:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/t/sel000003.test:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/t/sel000031.test:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/t/sel000032.test:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/t/sel000033.test:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/t/sel000100.test:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/t/shw000001.test:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/t/status.test:
  Use default port and socket.
sql/gen_lex_hash.cc:
  Smaller hash table
sql/mysql_priv.h:
  Allow concurrent inserts if no update/binary log
sql/mysqld.cc:
  Allow concurrent inserts if no update/binary log
  Don't remove key_cache at flush tables
sql/sql_base.cc:
  Don't remove key_cache at flush tables
sql/sql_select.cc:
  Fix bug in SELECT DISTINCT SUM().
sql/sql_yacc.yy:
  Allow concurrent inserts if no update/binary log
tests/export.pl:
  C

32 files changed, 52 insertions, 40 deletions

diff --git a/mysql-test/r/join_crash.result b/mysql-test/r/join_crash.result
new file mode 100644
index 00000000000..f7bef8af8ec
--- /dev/null
+++ b/mysql-test/r/join_crash.result
@@ -0,0 +1 @@
+project_id	project_name	client_ptr	comments	total_budget
diff --git a/mysql-test/r/rpl000005.result b/mysql-test/r/rpl000005.result
index 2be354af151..4f1541c75ca 100644
--- a/mysql-test/r/rpl000005.result
+++ b/mysql-test/r/rpl000005.result
@@ -2,3 +2,7 @@ name	age	id
 Andy	31	00000001
 Jacob	2	00000002
 Caleb	1	00000003
+name	age	id
+Andy	31	00000001
+Jacob	2	00000002
+Caleb	1	00000003
diff --git a/mysql-test/r/rpl000006.result b/mysql-test/r/rpl000006.result
index d2a036b9154..31a36f88f39 100644
--- a/mysql-test/r/rpl000006.result
+++ b/mysql-test/r/rpl000006.result
@@ -1,2 +1,4 @@
 unix_timestamp(t)
 200006
+unix_timestamp(t)
+200006
diff --git a/mysql-test/r/rpl000012.result b/mysql-test/r/rpl000012.result
index 414468f0998..ec2bd0684f1 100644
--- a/mysql-test/r/rpl000012.result
+++ b/mysql-test/r/rpl000012.result
@@ -5,3 +5,5 @@ n
 4
 5
 6
+Variable_name	Value
+Slave_open_temp_tables	0
diff --git a/mysql-test/r/rpl000012.status.result b/mysql-test/r/rpl000012.status.result
deleted file mode 100644
index c03e09c99bc..00000000000
--- a/mysql-test/r/rpl000012.status.result
+++ /dev/null
@@ -1,2 +0,0 @@
-Variable_name	Value
-Slave_open_temp_tables	0
diff --git a/mysql-test/r/rpl000013.result b/mysql-test/r/rpl000013.result
index 414468f0998..ec2bd0684f1 100644
--- a/mysql-test/r/rpl000013.result
+++ b/mysql-test/r/rpl000013.result
@@ -5,3 +5,5 @@ n
 4
 5
 6
+Variable_name	Value
+Slave_open_temp_tables	0
diff --git a/mysql-test/r/rpl000013.status.result b/mysql-test/r/rpl000013.status.result
deleted file mode 100644
index c03e09c99bc..00000000000
--- a/mysql-test/r/rpl000013.status.result
+++ /dev/null
@@ -1,2 +0,0 @@
-Variable_name	Value
-Slave_open_temp_tables	0
diff --git a/mysql-test/r/sel000033.result b/mysql-test/r/sel000033.result
index 1a1325d4360..689c94082e7 100644
--- a/mysql-test/r/sel000033.result
+++ b/mysql-test/r/sel000033.result
@@ -2,3 +2,7 @@ id
 2
 5
 9
+id
+2
+5
+9
diff --git a/mysql-test/t/backup.test b/mysql-test/t/backup.test
index 22ec4b6f2f1..e55ed4ca17b 100644
--- a/mysql-test/t/backup.test
+++ b/mysql-test/t/backup.test
@@ -1,5 +1,5 @@
-connect (con1,localhost,root,,test,0,mysql-master.sock);
-connect (con2,localhost,root,,test,0,mysql-master.sock);
+connect (con1,localhost,root,,);
+connect (con2,localhost,root,,);
 connection con1;
 set SQL_LOG_BIN=0;
 drop table if exists t1;
diff --git a/mysql-test/t/dirty-close.test b/mysql-test/t/dirty-close.test
index 69ee7162314..3ed22f26d5b 100644
--- a/mysql-test/t/dirty-close.test
+++ b/mysql-test/t/dirty-close.test
@@ -1,5 +1,5 @@
-connect (con1,localhost,root,,test,0,mysql-master.sock);
-connect (con2,localhost,root,,test,0,mysql-master.sock);
+connect (con1,localhost,root,,);
+connect (con2,localhost,root,,);
 connection con1;
 dirty_close con1;
 connection con2;
diff --git a/mysql-test/t/flush.test b/mysql-test/t/flush.test
index 5738f217d01..773becfeba1 100644
--- a/mysql-test/t/flush.test
+++ b/mysql-test/t/flush.test
@@ -1,5 +1,5 @@
-connect (con1,localhost,root,,test,0,mysql-master.sock);
-connect (con2,localhost,root,,test,0,mysql-master.sock);
+connect (con1,localhost,root,,);
+connect (con2,localhost,root,,);
 connection con1;
 drop table if exists t1;
 create temporary table t1(n int not null primary key);
diff --git a/mysql-test/t/kill.test b/mysql-test/t/kill.test
index 0191461f73f..be6860a3cc3 100644
--- a/mysql-test/t/kill.test
+++ b/mysql-test/t/kill.test
@@ -1,5 +1,5 @@
-connect (con1, localhost, root,,test,0, mysql-master.sock);
-connect (con2, localhost, root,,test,0, mysql-master.sock);
+connect (con1, localhost, root,,);
+connect (con2, localhost, root,,);
 
 #remember id of con1
 connection con1;
diff --git a/mysql-test/t/overflow.test b/mysql-test/t/overflow.test
index 73554200dce..7a652257bac 100644
--- a/mysql-test/t/overflow.test
+++ b/mysql-test/t/overflow.test
@@ -1,4 +1,4 @@
-connect (con1,localhost,boo,,test,0,mysql-master.sock);
+connect (con1,localhost,boo,,);
 connection con1;
 -- error 1064;
 drop database AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA;
diff --git a/mysql-test/t/rpl000003.test b/mysql-test/t/rpl000003.test
index b5957615c5b..c4b120d31b0 100644
--- a/mysql-test/t/rpl000003.test
+++ b/mysql-test/t/rpl000003.test
@@ -7,7 +7,7 @@ insert into t1 values (3);
 save_master_pos;
 connection slave;
 sync_with_master;
-@r/rpl000003.result select * from t1;                                     
+select * from t1;                                     
 connection master;
 drop table t1;
 save_master_pos;
diff --git a/mysql-test/t/rpl000005.test b/mysql-test/t/rpl000005.test
index 3e1d14912b2..92d954a6182 100644
--- a/mysql-test/t/rpl000005.test
+++ b/mysql-test/t/rpl000005.test
@@ -6,11 +6,11 @@ INSERT INTO  t1 SET name='Andy', age=31;
 INSERT t1 SET name='Jacob', age=2;
 INSERT into t1 SET name='Caleb', age=1;
 ALTER TABLE t1 ADD id int(8) ZEROFILL AUTO_INCREMENT PRIMARY KEY;
-@r/rpl000005.result select * from t1;
+select * from t1;
 save_master_pos;
 connection slave;
 sync_with_master;
-@r/rpl000005.result select * from t1;
+select * from t1;
 connection master;
 drop table t1;
 save_master_pos;
diff --git a/mysql-test/t/rpl000006.test b/mysql-test/t/rpl000006.test
index ffab3ebfc1e..8668aac0b72 100644
--- a/mysql-test/t/rpl000006.test
+++ b/mysql-test/t/rpl000006.test
@@ -5,11 +5,11 @@ set timestamp=200006;
 drop table if exists foo;
 create table foo(t timestamp not null,a char(1));
 insert into foo ( a) values ('F');
-@r/rpl000006.result select unix_timestamp(t) from foo;
+select unix_timestamp(t) from foo;
 connection slave;
 drop table if exists foo;
 load table foo from master;
-@r/rpl000006.result select unix_timestamp(t) from foo;
+select unix_timestamp(t) from foo;
 connection master;
 drop table foo;
 save_master_pos;
diff --git a/mysql-test/t/rpl000007.test b/mysql-test/t/rpl000007.test
index 5b121afaa99..4425a5725e8 100644
--- a/mysql-test/t/rpl000007.test
+++ b/mysql-test/t/rpl000007.test
@@ -18,7 +18,7 @@ insert into bar values(15);
 save_master_pos;
 connection slave;
 sync_with_master;
-@r/rpl000007.result select foo.n,bar.m from foo,bar;
+select foo.n,bar.m from foo,bar;
 connection master;
 drop table if exists bar,foo;
 save_master_pos;
diff --git a/mysql-test/t/rpl000008.test b/mysql-test/t/rpl000008.test
index 8cbc724c3a6..12760008b6d 100644
--- a/mysql-test/t/rpl000008.test
+++ b/mysql-test/t/rpl000008.test
@@ -20,7 +20,7 @@ insert into choo values(55);
 save_master_pos;
 connection slave;
 sync_with_master;
-@r/rpl000008.result select foo.n,bar.m,choo.k from foo,bar,choo;
+select foo.n,bar.m,choo.k from foo,bar,choo;
 connection master;
 drop table if exists foo,bar,choo;
 save_master_pos;
diff --git a/mysql-test/t/rpl000009.test b/mysql-test/t/rpl000009.test
index 1f20981f7d0..768c6c151b4 100644
--- a/mysql-test/t/rpl000009.test
+++ b/mysql-test/t/rpl000009.test
@@ -22,7 +22,7 @@ insert into bar.bar values(15);
 save_master_pos;
 connection slave;
 sync_with_master;
-@r/rpl000009.result select foo.foo.n,bar.bar.m from foo.foo,bar.bar;
+select foo.foo.n,bar.bar.m from foo.foo,bar.bar;
 connection master;
 drop database if exists bar;
 drop database if exists foo;
diff --git a/mysql-test/t/rpl000010.test b/mysql-test/t/rpl000010.test
index 8f6b8d449ac..05a211fbd85 100644
--- a/mysql-test/t/rpl000010.test
+++ b/mysql-test/t/rpl000010.test
@@ -11,7 +11,7 @@ insert into t1 values(2);
 save_master_pos;
 connection slave;
 sync_with_master;
-@r/rpl000010.result select n from t1;
+select n from t1;
 connection master;
 drop table t1;
 save_master_pos;
diff --git a/mysql-test/t/rpl000011.test b/mysql-test/t/rpl000011.test
index 04b6898f74a..7d99222b3c7 100644
--- a/mysql-test/t/rpl000011.test
+++ b/mysql-test/t/rpl000011.test
@@ -15,7 +15,7 @@ save_master_pos;
 connection slave;
 #let slave catch up
 sync_with_master;
-@r/rpl000011.result select * from t1;
+select * from t1;
 connection master;
 drop table t1;
 save_master_pos;
diff --git a/mysql-test/t/rpl000012.test b/mysql-test/t/rpl000012.test
index eddd3ede1d7..ec93234094e 100644
--- a/mysql-test/t/rpl000012.test
+++ b/mysql-test/t/rpl000012.test
@@ -24,12 +24,12 @@ disconnect master1;
 connection slave;
 #same trick - make sure we catch drop of temporary table on disconnect
 sync_with_master 1;
-@r/rpl000012.result select * from t2;
-@r/rpl000012.status.result show status like 'Slave_open_temp_tables';
+select * from t2;
+show status like 'Slave_open_temp_tables';
 #
 # Clean up
 #
-connect (master2,localhost,root,,test,0,mysql-master.sock);
+connect (master2,localhost,root,,);
 connection master2;
 drop table if exists t1,t2;
 save_master_pos;
diff --git a/mysql-test/t/rpl000013.test b/mysql-test/t/rpl000013.test
index f870d017fa3..af693a720d4 100644
--- a/mysql-test/t/rpl000013.test
+++ b/mysql-test/t/rpl000013.test
@@ -25,12 +25,12 @@ disconnect master1;
 connection slave;
 # same trick to go one more event
 sync_with_master 1;
-@r/rpl000013.result select * from t2;
-@r/rpl000013.status.result show status like 'Slave_open_temp_tables';
+select * from t2;
+show status like 'Slave_open_temp_tables';
 #
 # Clean up
 #
-connect (master2,localhost,root,,test,0,mysql-master.sock);
+connect (master2,localhost,root,,);
 connection master2;
 drop table if exists t1,t2;
 save_master_pos;
diff --git a/mysql-test/t/sel000001.test b/mysql-test/t/sel000001.test
index 06453fad7cc..77355f8d535 100644
--- a/mysql-test/t/sel000001.test
+++ b/mysql-test/t/sel000001.test
@@ -14,5 +14,5 @@
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (s CHAR(20) PRIMARY KEY, id INT);
 INSERT INTO t1 VALUES ('cat', 1), ('mouse', 3), ('dog', 2), ('snake', 77);
-@r/sel000001.result SELECT s, id FROM t1 WHERE s = 'mouse';
+SELECT s, id FROM t1 WHERE s = 'mouse';
 drop table t1;
diff --git a/mysql-test/t/sel000002.test b/mysql-test/t/sel000002.test
index 2bc8ed0c6d7..9a89db2821c 100644
--- a/mysql-test/t/sel000002.test
+++ b/mysql-test/t/sel000002.test
@@ -13,5 +13,5 @@
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (n INT);
 INSERT INTO t1 VALUES (1), (2), (3);
-@r/sel000002.result SELECT * FROM t1;
+SELECT * FROM t1;
 drop table t1;
diff --git a/mysql-test/t/sel000003.test b/mysql-test/t/sel000003.test
index 3bef531366b..a3f6a7337c2 100644
--- a/mysql-test/t/sel000003.test
+++ b/mysql-test/t/sel000003.test
@@ -14,5 +14,5 @@
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (name CHAR(20) NOT NULL PRIMARY KEY, score SMALLINT NOT NULL, KEY(score));
 INSERT INTO t1 VALUES ('Sasha', 20), ('Matt', 20), ('Monty', 10), ('David', 10), ('Tim', 10), ('Jeremy', 10);
-@r/sel000003.result SELECT COUNT(*) as n, score FROM t1 GROUP BY score;
+SELECT COUNT(*) as n, score FROM t1 GROUP BY score;
 drop table t1;
diff --git a/mysql-test/t/sel000031.test b/mysql-test/t/sel000031.test
index b1591ef3486..29bafbb3040 100644
--- a/mysql-test/t/sel000031.test
+++ b/mysql-test/t/sel000031.test
@@ -16,5 +16,5 @@ val int(10) not null);
 insert into t1 values (1),(2),(4);
 insert into t2 values (1,1),(2,1),(3,1),(4,2);
 
-@r/sel000031.result select one.id, elt(two.val,'one','two') from t1 one, t2 two where two.id=one.id order by one.id;
+select one.id, elt(two.val,'one','two') from t1 one, t2 two where two.id=one.id order by one.id;
 drop table t1,t2;
diff --git a/mysql-test/t/sel000032.test b/mysql-test/t/sel000032.test
index a9adc8ffb6d..d31ba69e9d8 100644
--- a/mysql-test/t/sel000032.test
+++ b/mysql-test/t/sel000032.test
@@ -16,4 +16,5 @@ val int(10) not null);
 insert into t1 values (1),(2),(4);
 insert into t2 values (1,1),(2,1),(3,1),(4,2);
 
-@r/sel000032.result select one.id, elt(two.val,'one','two') from t1 one, t2 two where two.id=one.id;
+select one.id, elt(two.val,'one','two') from t1 one, t2 two where two.id=one.id;
+drop table t1,t2;
diff --git a/mysql-test/t/sel000033.test b/mysql-test/t/sel000033.test
index 58c103979d0..165e43ad9f8 100644
--- a/mysql-test/t/sel000033.test
+++ b/mysql-test/t/sel000033.test
@@ -13,6 +13,6 @@ drop table if exists t1;
 create  table t1 (id int(10) primary key);
 insert into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9);
 
-@r/sel000033.result select id from t1 where id in (2,5,9) ;
-@r/sel000033.result select id from t1 where id=2 or id=5 or id=9 ;
+select id from t1 where id in (2,5,9) ;
+select id from t1 where id=2 or id=5 or id=9 ;
 drop table t1;
diff --git a/mysql-test/t/sel000100.test b/mysql-test/t/sel000100.test
index a1dbab42dab..cedb78b17e7 100644
--- a/mysql-test/t/sel000100.test
+++ b/mysql-test/t/sel000100.test
@@ -20,7 +20,7 @@ CREATE TABLE t2 (
   KEY NAME (NAME)
 );
 
-@r/sel000100.result SELECT DISTINCT
+SELECT DISTINCT
     t2.id AS key_link_id,
     t2.name AS link
 FROM t1
diff --git a/mysql-test/t/shw000001.test b/mysql-test/t/shw000001.test
index a1ba2a18faf..6b24d8a44c7 100644
--- a/mysql-test/t/shw000001.test
+++ b/mysql-test/t/shw000001.test
@@ -4,5 +4,5 @@ create table t1 (
   test_set set( 'val1', 'val2', 'val3' ) not null default '',
   name char(20) default 'O''Brien'
   ) comment = 'it\'s a table' ;
-@r/shw000001.result show create table t1 ;
+show create table t1 ;
 drop table t1;
diff --git a/mysql-test/t/status.test b/mysql-test/t/status.test
index 8b5ab3565ad..70a7a3ab584 100644
--- a/mysql-test/t/status.test
+++ b/mysql-test/t/status.test
@@ -1,5 +1,5 @@
-connect (con1,localhost,root,,test,0,mysql-master.sock);
-connect (con2,localhost,root,,test,0,mysql-master.sock);
+connect (con1,localhost,root,,);
+connect (con2,localhost,root,,);
 
 flush status;
 show status like 'Table_lock%';