summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorserg@serg.mysql.com <>2001-10-22 11:57:48 +0200
committerserg@serg.mysql.com <>2001-10-22 11:57:48 +0200
commitabbb522024799ce4a51685949e880c33c052c1d2 (patch)
tree8b062a08d4895622a57e2a2fa220fa1d6115b5c4 /mysql-test
parent6a301204ca8ad0e53a168eb489d94159bb71b250 (diff)
parent392315df0c3c43f45ff016c002ca7971d1ad8fae (diff)
downloadmariadb-git-abbb522024799ce4a51685949e880c33c052c1d2.tar.gz
Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/mysql-test-run.sh10
-rw-r--r--mysql-test/r/fulltext.result16
-rw-r--r--mysql-test/t/fulltext.test19
3 files changed, 42 insertions, 3 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/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;
+