summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BitKeeper/etc/config1
-rw-r--r--mysql-test/r/ft0000001.a.result3
-rw-r--r--mysql-test/r/ft0000001.b.result3
-rw-r--r--mysql-test/r/ft0000001.c.result3
-rw-r--r--mysql-test/r/ft0000001.d.result2
-rw-r--r--mysql-test/r/ft0000001.e.result8
-rw-r--r--mysql-test/r/ft0000002.a.result4
-rw-r--r--mysql-test/r/ft0000002.b.result4
-rw-r--r--mysql-test/r/ft0000002.c.result4
-rw-r--r--mysql-test/r/fulltext_cache.result18
-rw-r--r--mysql-test/t/fulltext_cache.test32
11 files changed, 51 insertions, 31 deletions
diff --git a/BitKeeper/etc/config b/BitKeeper/etc/config
index 9e5a4507023..257f193723f 100644
--- a/BitKeeper/etc/config
+++ b/BitKeeper/etc/config
@@ -67,4 +67,5 @@ pager:
# Business Hours when we can contact you if you left a phone number.
#
hours:
+[serg:]checkout:get
checkout:edit
diff --git a/mysql-test/r/ft0000001.a.result b/mysql-test/r/ft0000001.a.result
deleted file mode 100644
index 0a99bccec1e..00000000000
--- a/mysql-test/r/ft0000001.a.result
+++ /dev/null
@@ -1,3 +0,0 @@
-a MATCH (message) AGAINST ('steve')
-4 0.90587321329654
-7 0.89568988462614
diff --git a/mysql-test/r/ft0000001.b.result b/mysql-test/r/ft0000001.b.result
deleted file mode 100644
index 0a99bccec1e..00000000000
--- a/mysql-test/r/ft0000001.b.result
+++ /dev/null
@@ -1,3 +0,0 @@
-a MATCH (message) AGAINST ('steve')
-4 0.90587321329654
-7 0.89568988462614
diff --git a/mysql-test/r/ft0000001.c.result b/mysql-test/r/ft0000001.c.result
deleted file mode 100644
index 0a495a119e2..00000000000
--- a/mysql-test/r/ft0000001.c.result
+++ /dev/null
@@ -1,3 +0,0 @@
-a MATCH (message) AGAINST ('steve')
-7 0.89568988462614
-4 0.90587321329654
diff --git a/mysql-test/r/ft0000001.d.result b/mysql-test/r/ft0000001.d.result
deleted file mode 100644
index c3c145b2744..00000000000
--- a/mysql-test/r/ft0000001.d.result
+++ /dev/null
@@ -1,2 +0,0 @@
-a MATCH (message) AGAINST ('steve')
-7 0.89568988462614
diff --git a/mysql-test/r/ft0000001.e.result b/mysql-test/r/ft0000001.e.result
deleted file mode 100644
index 372839e5cf8..00000000000
--- a/mysql-test/r/ft0000001.e.result
+++ /dev/null
@@ -1,8 +0,0 @@
-a rel
-1 0
-2 0
-3 0
-5 0
-6 0
-7 0.89568988462614
-4 0.90587321329654
diff --git a/mysql-test/r/ft0000002.a.result b/mysql-test/r/ft0000002.a.result
deleted file mode 100644
index 576b086d13c..00000000000
--- a/mysql-test/r/ft0000002.a.result
+++ /dev/null
@@ -1,4 +0,0 @@
-a MATCH b AGAINST ('lala lkjh')
-1 0.67003110026735
-2 0
-3 0
diff --git a/mysql-test/r/ft0000002.b.result b/mysql-test/r/ft0000002.b.result
deleted file mode 100644
index d18d3484f21..00000000000
--- a/mysql-test/r/ft0000002.b.result
+++ /dev/null
@@ -1,4 +0,0 @@
-a MATCH c AGAINST ('lala lkjh')
-1 0
-2 0.67756324121582
-3 0
diff --git a/mysql-test/r/ft0000002.c.result b/mysql-test/r/ft0000002.c.result
deleted file mode 100644
index 58179329034..00000000000
--- a/mysql-test/r/ft0000002.c.result
+++ /dev/null
@@ -1,4 +0,0 @@
-a MATCH b,c AGAINST ('lala lkjh')
-1 0.64840710366884
-2 0.66266459031789
-3 0
diff --git a/mysql-test/r/fulltext_cache.result b/mysql-test/r/fulltext_cache.result
new file mode 100644
index 00000000000..347e53f37e1
--- /dev/null
+++ b/mysql-test/r/fulltext_cache.result
@@ -0,0 +1,18 @@
+q item id x
+aaaaaaaaa dsaass de sushi 1 1.92378665219675
+aaaaaaaaa dsaass de Bolo de Chocolate 2 0
+aaaaaaaaa dsaass de Feijoada 3 0
+aaaaaaaaa dsaass de Mousse de Chocolate 4 0
+ssde df s fsda sad er um copo de Vodka 5 0
+ssde df s fsda sad er um chocolate Snickers 6 0
+aaaaaaaaa dsaass de Bife 7 0
+aaaaaaaaa dsaass de Pizza de Salmao 8 0
+q item id x
+aaaaaaaaa dsaass de sushi 1 0
+aaaaaaaaa dsaass de Bolo de Chocolate 2 0
+aaaaaaaaa dsaass de Feijoada 3 0
+aaaaaaaaa dsaass de Mousse de Chocolate 4 0
+aaaaaaaaa dsaass de Bife 7 0
+aaaaaaaaa dsaass de Pizza de Salmao 8 0
+ssde df s fsda sad er um copo de Vodka 5 0
+ssde df s fsda sad er um chocolate Snickers 6 0
diff --git a/mysql-test/t/fulltext_cache.test b/mysql-test/t/fulltext_cache.test
new file mode 100644
index 00000000000..314ecf8642f
--- /dev/null
+++ b/mysql-test/t/fulltext_cache.test
@@ -0,0 +1,32 @@
+#
+# Bugreport due to Roy Nasser <roy@vem.ca>
+#
+
+CREATE TABLE t1 (
+ id int(10) unsigned NOT NULL auto_increment,
+ q varchar(255) default NULL,
+ PRIMARY KEY (id)
+);
+INSERT INTO t1 VALUES (1,'aaaaaaaaa dsaass de');
+INSERT INTO t1 VALUES (2,'ssde df s fsda sad er');
+CREATE TABLE t2 (
+ id int(10) unsigned NOT NULL auto_increment,
+ id2 int(10) unsigned default NULL,
+ item varchar(255) default NULL,
+ PRIMARY KEY (id),
+ FULLTEXT KEY item(item)
+);
+INSERT INTO t2 VALUES (1,1,'sushi');
+INSERT INTO t2 VALUES (2,1,'Bolo de Chocolate');
+INSERT INTO t2 VALUES (3,1,'Feijoada');
+INSERT INTO t2 VALUES (4,1,'Mousse de Chocolate');
+INSERT INTO t2 VALUES (5,2,'um copo de Vodka');
+INSERT INTO t2 VALUES (6,2,'um chocolate Snickers');
+INSERT INTO t2 VALUES (7,1,'Bife');
+INSERT INTO t2 VALUES (8,1,'Pizza de Salmao');
+
+SELECT item, id, MATCH item AGAINST ('sushi') as x FROM t2 ORDER BY x DESC;
+
+SELECT t1.q, t2.item, t2.id, MATCH t2.item AGAINST ('sushi') as x FROM t1, t2
+WHERE (t2.id2 = t1.id) ORDER BY x DESC;
+