Merge sinisa@work.mysql.com:/home/bk/mysql-4.0

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0

12 files changed, 130 insertions, 6 deletions

diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index 7428740d380..f99a594f1f1 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -673,9 +673,13 @@ start_master()
       "gdb -x $GDB_MASTER_INIT" $MYSQLD 
     elif [ x$DO_GDB = x1 ]
     then
-      $ECHO "set args $master_args" >  $GDB_MASTER_INIT
-      $ECHO "b mysql_parse"         >> $GDB_MASTER_INIT
-      $ECHO "r"                     >> $GDB_MASTER_INIT
+      $CAT <<__GDB_MASTER_INIT__  > $GDB_MASTER_INIT
+b mysql_parse
+commands 1
+dele 1
+end
+r $master_args
+__GDB_MASTER_INIT__
       manager_launch master $XTERM -display $DISPLAY \
       -title "Master" -e gdb -x $GDB_MASTER_INIT $MYSQLD 
     else	    
diff --git a/mysql-test/r/fulltext.result b/mysql-test/r/fulltext.result
index 47a823929f4..c2b4de5f439 100644
--- a/mysql-test/r/fulltext.result
+++ b/mysql-test/r/fulltext.result
@@ -112,3 +112,19 @@ Can't find FULLTEXT index matching the column list
 select * from t2,t3 where MATCH (t2.inhalt,t3.inhalt) AGAINST ('foobar');
 Wrong arguments to MATCH
 drop table t1,t2,t3;
+CREATE TABLE t1 (
+id int(11)  auto_increment,
+title varchar(100)  default '',
+PRIMARY KEY  (id),
+KEY ind5 (title),
+FULLTEXT KEY FT1 (title)
+) TYPE=MyISAM;
+insert into t1 (title) values ('this is a test');
+update t1 set title='this is A test' where id=1;
+check table t1;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+update t1 set title='this test once revealed a bug' where id=1;
+select * from t1;
+id	title
+1	this test once revealed a bug
diff --git a/mysql-test/r/join_outer.result b/mysql-test/r/join_outer.result
index 79f12ce9b2c..e23ab27b6aa 100644
--- a/mysql-test/r/join_outer.result
+++ b/mysql-test/r/join_outer.result
@@ -625,3 +625,11 @@ SELECT * from t1 left join t2 on t1.id=t2.id where t2.id IS NULL;
 id	name	id	idx
 2	no	NULL	NULL
 drop table t1,t2;
+create table t1 (bug_id mediumint, reporter mediumint);
+create table t2 (bug_id mediumint, who mediumint, index(who));
+insert into t2 values (1,1),(1,2);
+insert into t1 values (1,1),(2,1);
+SELECT * FROM t1 LEFT JOIN t2 ON (t1.bug_id =  t2.bug_id AND  t2.who = 2) WHERE  (t1.reporter = 2 OR t2.who = 2);
+bug_id	reporter	bug_id	who
+1	1	1	2
+drop table t1,t2;
diff --git a/mysql-test/r/keywords.result b/mysql-test/r/keywords.result
index 9553fffc23d..2ca36425841 100644
--- a/mysql-test/r/keywords.result
+++ b/mysql-test/r/keywords.result
@@ -8,3 +8,9 @@ select t1.time+0,t1.date+0,t1.timestamp+0,concat(date," ",time) from t1;
 t1.time+0	t1.date+0	t1.timestamp+0	concat(date," ",time)
 122222	19970203	19970102000000	1997-02-03 12:22:22
 drop table t1;
+create table events(binlog int);
+insert into events values(1);
+select events.binlog from events;
+binlog
+1
+drop table events;
diff --git a/mysql-test/r/null.result b/mysql-test/r/null.result
index 4758304afa0..77f2c67bf05 100644
--- a/mysql-test/r/null.result
+++ b/mysql-test/r/null.result
@@ -40,3 +40,20 @@ insert into t1 values (null);
 select * from t1 where x != 0;
 x
 drop table t1;
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 (
+indexed_field int default NULL,
+KEY indexed_field (indexed_field)
+);
+INSERT INTO t1 VALUES (NULL),(NULL);
+SELECT * FROM t1 WHERE indexed_field=NULL;
+indexed_field
+SELECT * FROM t1 WHERE indexed_field IS NULL;
+indexed_field
+NULL
+NULL
+SELECT * FROM t1 WHERE indexed_field<=>NULL;
+indexed_field
+NULL
+NULL
+DROP TABLE t1;
diff --git a/mysql-test/r/rpl000001.result b/mysql-test/r/rpl000001.result
index 9cd0496d16e..5299ff1f8d0 100644
--- a/mysql-test/r/rpl000001.result
+++ b/mysql-test/r/rpl000001.result
@@ -7,6 +7,29 @@ use test;
 drop table if exists t1,t3;
 create table t1 (word char(20) not null);
 load data infile '../../std_data/words.dat' into table t1;
+ load data local infile '/home/sasha/bk/mysql-4.0/mysql-test/std_data/words.dat' into table t1;
+select * from t1;
+word
+Aarhus
+Aaron
+Ababa
+aback
+abaft
+abandon
+abandoned
+abandoning
+abandonment
+abandons
+Aarhus
+Aaron
+Ababa
+aback
+abaft
+abandon
+abandoned
+abandoning
+abandonment
+abandons
 set password = password('foo');
 set password = password('');
 create table t3(n int);
@@ -18,7 +41,7 @@ n
 2
 select sum(length(word)) from t1;
 sum(length(word))
-71
+141
 drop table t1,t3;
 reset master;
 reset slave;
diff --git a/mysql-test/r/rpl000002.result b/mysql-test/r/rpl000002.result
index 27b61a0af1b..e321d82750c 100644
--- a/mysql-test/r/rpl000002.result
+++ b/mysql-test/r/rpl000002.result
@@ -15,8 +15,8 @@ n
 2001
 2002
 show slave hosts;
-Server_id	Host	Port
-2	127.0.0.1	$SLAVE_MYPORT
+Server_id	Host	Port	Rpl_recovery_rank	Master_id
+2	127.0.0.1	9307	2	1
 drop table t1;
 slave stop;
 drop table if exists t2;
diff --git a/mysql-test/t/fulltext.test b/mysql-test/t/fulltext.test
index 4f7df2ac0b0..af58c747167 100644
--- a/mysql-test/t/fulltext.test
+++ b/mysql-test/t/fulltext.test
@@ -92,3 +92,22 @@ select * from t2 where MATCH ticket AGAINST ('foobar');
 select * from t2,t3 where MATCH (t2.inhalt,t3.inhalt) AGAINST ('foobar');
 
 drop table t1,t2,t3;
+
+#
+# two more bugtests
+#
+
+CREATE TABLE t1 (
+  id int(11)  auto_increment,
+  title varchar(100)  default '',
+  PRIMARY KEY  (id),
+  KEY ind5 (title),
+  FULLTEXT KEY FT1 (title)
+) TYPE=MyISAM;
+
+insert into t1 (title) values ('this is a test');
+update t1 set title='this is A test' where id=1;
+check table t1;
+update t1 set title='this test once revealed a bug' where id=1;
+select * from t1;
+
diff --git a/mysql-test/t/join_outer.test b/mysql-test/t/join_outer.test
index a6da5fd577c..774f35ae38e 100644
--- a/mysql-test/t/join_outer.test
+++ b/mysql-test/t/join_outer.test
@@ -394,3 +394,13 @@ INSERT INTO t2 VALUES (1,1);
 explain SELECT * from t1 left join t2 on t1.id=t2.id where t2.id IS NULL;
 SELECT * from t1 left join t2 on t1.id=t2.id where t2.id IS NULL;
 drop table t1,t2;
+
+#
+# Test problem with using key_column= constant in ON and WHERE
+#
+create table t1 (bug_id mediumint, reporter mediumint);
+create table t2 (bug_id mediumint, who mediumint, index(who));
+insert into t2 values (1,1),(1,2);
+insert into t1 values (1,1),(2,1);
+SELECT * FROM t1 LEFT JOIN t2 ON (t1.bug_id =  t2.bug_id AND  t2.who = 2) WHERE  (t1.reporter = 2 OR t2.who = 2);
+drop table t1,t2;
diff --git a/mysql-test/t/keywords.test b/mysql-test/t/keywords.test
index b9a1f34c715..3bd757aa069 100644
--- a/mysql-test/t/keywords.test
+++ b/mysql-test/t/keywords.test
@@ -8,3 +8,7 @@ insert into t1 values ("12:22:22","97:02:03","1997-01-02");
 select * from t1;
 select t1.time+0,t1.date+0,t1.timestamp+0,concat(date," ",time) from t1;
 drop table t1;
+create table events(binlog int);
+insert into events values(1);
+select events.binlog from events;
+drop table events;
diff --git a/mysql-test/t/null.test b/mysql-test/t/null.test
index f1fe2cf2c9f..a010ab38e07 100644
--- a/mysql-test/t/null.test
+++ b/mysql-test/t/null.test
@@ -20,3 +20,18 @@ create table t1 (x int);
 insert into t1 values (null);
 select * from t1 where x != 0;
 drop table t1;
+
+#
+# Test problem med index on NULL columns and testing with =NULL;
+#
+
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 (
+  indexed_field int default NULL,
+  KEY indexed_field (indexed_field)
+);
+INSERT INTO t1 VALUES (NULL),(NULL);
+SELECT * FROM t1 WHERE indexed_field=NULL;
+SELECT * FROM t1 WHERE indexed_field IS NULL;
+SELECT * FROM t1 WHERE indexed_field<=>NULL;
+DROP TABLE t1;
diff --git a/mysql-test/t/rpl000001.test b/mysql-test/t/rpl000001.test
index 113a9637dac..3ed5daf3e81 100644
--- a/mysql-test/t/rpl000001.test
+++ b/mysql-test/t/rpl000001.test
@@ -4,6 +4,8 @@ use test;
 drop table if exists t1,t3;
 create table t1 (word char(20) not null);
 load data infile '../../std_data/words.dat' into table t1;
+eval load data local infile '$MYSQL_TEST_DIR/std_data/words.dat' into table t1;
+select * from t1;
 set password = password('foo');
 set password = password('');
 create table t3(n int);