Removed duplicated index_init() calls that causes problems with BDB

tables.
Merged maxsql.spec with mysql.spec


mysql-test/r/innobase.result:
  Almost up to date test results
mysql-test/t/innobase.test:
  Added testing of error codes
sql-bench/test-insert.sh:
  Added testing of key-only-read
sql/ha_berkeley.cc:
  Added DBUG_PRINT
sql/sql_select.cc:
  Removed duplicated index_init() calls
support-files/maxsql.spec.sh:
  Merge with mysql.spec.  Take into account that BDB and Innobase is
  in the MySQL source tree
support-files/mysql.spec.sh:
  Removed usage of innobase in standard RPM

2 files changed, 60 insertions, 21 deletions

diff --git a/mysql-test/r/innobase.result b/mysql-test/r/innobase.result
index b008413dd7e..81add1e9d89 100644
--- a/mysql-test/r/innobase.result
+++ b/mysql-test/r/innobase.result
@@ -108,14 +108,14 @@ id	parent_id	level
 1204	107	2
 id	parent_id	level
 1008	102	2
-1015	102	2
 1010	102	2
+1015	102	2
 table	type	possible_keys	key	key_len	ref	rows	Extra
-t1	ref	level	level	1	const	1	where used; Using index
+t1	index	level	level	1	NULL	39	where used; Using index
 table	type	possible_keys	key	key_len	ref	rows	Extra
-t1	ref	level	level	1	const	1	where used; Using index
+t1	index	level	level	1	NULL	39	where used; Using index
 table	type	possible_keys	key	key_len	ref	rows	Extra
-t1	ref	level	level	1	const	1	where used
+t1	ref	level	level	1	const	12	
 level	id
 1	1002
 1	1003
@@ -130,28 +130,29 @@ level	id	parent_id
 1	1005	101
 1	1006	101
 1	1007	101
+Table	Op	Msg_type	Msg_text
+test.t1	optimize	error	The handler for the table doesn't support check/repair
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Comment
+t1	0	PRIMARY	1	id	A	2	NULL	NULL	
+t1	1	parent_id	1	parent_id	A	4	NULL	NULL	
+t1	1	level	1	level	A	4	NULL	NULL	
 gesuchnr	benutzer_id
 1	1
 2	1
+Table	Op	Msg_type	Msg_text
+test.t1	optimize	error	The handler for the table doesn't support check/repair
 a
 2
+Table	Op	Msg_type	Msg_text
+test.t1	check	error	The handler for the table doesn't support check/repair
 a	b
-a	1
-a	2
-a	3
-a	4
-a	5
-b	2
-b	3
-b	4
-c	1
-c	2
-c	3
-d	1
-d	2
-d	5
-e	1
-k	1
+2	testing
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	error	The handler for the table doesn't support check/repair
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Comment
+t1	1	skr	1	a	A	3	NULL	NULL	
+a	b
+1	
 n	after rollback
 n	after commit
 4	after commit
@@ -249,6 +250,11 @@ id	ggid	email	passwd
 1	test1		xxx
 id	ggid	email	passwd
 2	test2		yyy
+id	ggid	email	passwd
+2	test2		yyy
+100	test2		xxx
+id	ggid	email	passwd
+id	ggid	email	passwd
 user_name	password	subscribed	user_id	quota	weight	access_date	access_time	approved	dummy_primary_key
 user_0	somepassword	N	0	0	0	2000-09-07	23:06:59	2000-09-07 23:06:59	1
 user_1	somepassword	Y	1	1	1	2000-09-07	23:06:59	2000-09-07 23:06:59	2
@@ -344,7 +350,7 @@ id	parent_id	level
 1025	102	2
 1016	102	2
 table	type	possible_keys	key	key_len	ref	rows	Extra
-t1	ref	level	level	1	const	1	where used; Using index
+t1	ref	level	level	1	const	6	where used; Using index
 level	id
 1	1004
 1	1005
@@ -402,7 +408,37 @@ id	parent_id	level
 1180	105	2
 count(*)
 1
+count(*)
+1
+count(*)
+2
+count(*)
+1
+count(*)
+0
+count(*)
+1
+count(*)
+1
+sca_pic
+NULL
+NULL
 a
 1
 2
 3
+a
+2
+3
+5
+a	b
+world	2
+hello	1
+Table	Op	Msg_type	Msg_text
+test.t1	optimize	error	The handler for the table doesn't support check/repair
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Comment
+t1	0	PRIMARY	1	a	A	1	NULL	NULL	
+i	j
+1	2
+i	j
+1	2
diff --git a/mysql-test/t/innobase.test b/mysql-test/t/innobase.test
index bca10751c13..5b1dade44db 100644
--- a/mysql-test/t/innobase.test
+++ b/mysql-test/t/innobase.test
@@ -61,6 +61,7 @@ CREATE TABLE t1 (
 
 replace into t1 (gesuchnr,benutzer_id) values (2,1);
 replace into t1 (gesuchnr,benutzer_id) values (1,1);
+--error 1022
 replace into t1 (gesuchnr,benutzer_id) values (1,1);
 select * from t1;
 drop table t1;
@@ -268,7 +269,9 @@ select * from t1 where ggid='test1';
 select * from t1 where passwd='xxx';
 select * from t1 where id=2;
 
+--error 1022
 replace into t1 (ggid,id) values ('this will work',1);
+--error 1022
 replace into t1 (ggid,passwd) values ('test2','this will work');
 -- error 1062
 update t1 set id=100,ggid='test2' where id=1;