Merge work:/home/bk/mysql

into mysql.sashanet.com:/home/sasha/src/bk/mysql

6 files changed, 81 insertions, 8 deletions

diff --git a/mysql-test/r/bdb.result b/mysql-test/r/bdb.result
index 39b4962ef58..e66ca657484 100644
--- a/mysql-test/r/bdb.result
+++ b/mysql-test/r/bdb.result
@@ -524,3 +524,6 @@ a	b	a	b
 a	b
 1	1
 1	2
+id	id2	id3	dummy1
+id	id2	id3	dummy1
+NULL	NULL	NULL	NULL
diff --git a/mysql-test/r/isam.result b/mysql-test/r/isam.result
new file mode 100644
index 00000000000..ba12ca05feb
--- /dev/null
+++ b/mysql-test/r/isam.result
@@ -0,0 +1,10 @@
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+Table	Op	Msg_type	Msg_text
+test.t1	repair	status	OK
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+Table	Op	Msg_type	Msg_text
+test.t1	repair	status	OK
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result
index 694d7429a14..1152ca24f38 100644
--- a/mysql-test/r/myisam.result
+++ b/mysql-test/r/myisam.result
@@ -1,2 +1,12 @@
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+Table	Op	Msg_type	Msg_text
+test.t1	repair	status	OK
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+Table	Op	Msg_type	Msg_text
+test.t1	repair	status	OK
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
diff --git a/mysql-test/t/bdb.test b/mysql-test/t/bdb.test
index 5e28c31e051..465dc9634cc 100644
--- a/mysql-test/t/bdb.test
+++ b/mysql-test/t/bdb.test
@@ -727,13 +727,24 @@ DROP TABLE t1,t2;
 # Test problem with joining table to itself on a multi-part unique key
 #
 
-drop table if exists t;
-create table t (a int(11) not null, b int(11) not null, unique (a,b)) type=bdb;
-
-insert into t values (1,1), (1,2);
+drop table if exists t1;
+create table t1 (a int(11) not null, b int(11) not null, unique (a,b)) type=bdb;
+insert into t1 values (1,1), (1,2);
+select * from t1 where a = 1;
+select t1.*, t2.* from t1, t1 t2 where t1.a = t2.a and t2.a = 1;
+select * from t1 where a = 1;
+drop table t1;
 
-select * from t where a = 1;
-select t1.*, t2.* from t t1, t t2 where t1.a = t2.a and t2.a = 1;
-select * from t where a = 1;
+#
+# This caused a deadlock in BDB internal locks
+#
 
-drop table t;
+create table t1 (id int NOT NULL,id2 int NOT NULL,id3 int NOT NULL,dummy1 char(30),primary key (id,id2),index index_id3 (id3)) type=bdb;
+insert into t1 values (0,0,0,'ABCDEFGHIJ');
+create table t2 (id int NOT NULL,primary key (id)) type=bdb;
+LOCK TABLES t1 WRITE, t2 WRITE;
+insert into t2 values(1);
+SELECT t1.* FROM t1 WHERE id IN (1);
+SELECT t1.* FROM t2 left outer join t1 on (t1.id=t2.id);
+delete from t1 where id3 >= 0 and id3 <= 0;
+drop table t1,t2;
diff --git a/mysql-test/t/isam.test b/mysql-test/t/isam.test
new file mode 100644
index 00000000000..1cf068b42ba
--- /dev/null
+++ b/mysql-test/t/isam.test
@@ -0,0 +1,19 @@
+#
+# Test possible problem with rows that are about 65535 bytes long
+#
+
+create table t1 (a tinyint not null auto_increment, b blob not null, primary key (a));
+
+let $1=100;
+while ($1)
+{
+  eval insert into t1 (b) values(repeat(char(65+$1),65540-$1));
+  dec $1;
+}
+check table t1;
+repair table t1;
+delete from t1 where (a & 1);
+check table t1;
+repair table t1;
+check table t1;
+drop table t1;
diff --git a/mysql-test/t/myisam.test b/mysql-test/t/myisam.test
index 84feb5de6d7..0dc7f84efc5 100644
--- a/mysql-test/t/myisam.test
+++ b/mysql-test/t/myisam.test
@@ -16,3 +16,23 @@ INSERT INTO t1 VALUES ('HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH
 INSERT INTO t1 VALUES ('WWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW');
 CHECK TABLE t1;
 drop table t1;
+
+#
+# Test problem with rows that are 65517-65520 bytes long
+#
+
+create table t1 (a tinyint not null auto_increment, b blob not null, primary key (a));
+
+let $1=100;
+while ($1)
+{
+  eval insert into t1 (b) values(repeat(char(65+$1),65550-$1));
+  dec $1;
+}
+check table t1;
+repair table t1;
+delete from t1 where (a & 1);
+check table t1;
+repair table t1;
+check table t1;
+drop table t1;