database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Fix when using --without-server --with-thread-safe-client

Browse Source 
Added prototype for my_thread_end
New error message for MATCH
Give error when using myisamchk --force --readonly


BitKeeper/deleted/.del-fulltext_join.test~e347c8f04405c916:
  Delete: mysql-test/t/fulltext_join.test
Docs/manual.texi:
  Added node to fulltext
configure.in:
  Fix when using --without-server --with-thread-safe-client
include/mysql_com.h:
  Added prototype for my_thread_end
include/mysqld_error.h:
  New error message for MATCH
myisam/myisamchk.c:
  Give error when using --force --readonly
mysql-test/t/fulltext.test:
  Added test for error conditons with fulltext
sql/item_func.cc:
  Fixed error messages when using MATCH ... AGAINST
sql/mysqld.cc:
  Portability fix
sql/share/czech/errmsg.txt:
  New error message when using MATCH
sql/share/danish/errmsg.txt:
  New error message when using MATCH
sql/share/dutch/errmsg.txt:
  New error message when using MATCH
sql/share/english/errmsg.txt:
  New error message when using MATCH
sql/share/estonian/errmsg.txt:
  New error message when using MATCH
sql/share/french/errmsg.txt:
  New error message when using MATCH
sql/share/german/errmsg.txt:
  New error message when using MATCH
sql/share/greek/errmsg.txt:
  New error message when using MATCH
sql/share/hungarian/errmsg.txt:
  New error message when using MATCH
sql/share/italian/errmsg.txt:
  New error message when using MATCH
sql/share/japanese/errmsg.txt:
  New error message when using MATCH
sql/share/korean/errmsg.txt:
  New error message when using MATCH
sql/share/norwegian-ny/errmsg.txt:
  New error message when using MATCH
sql/share/norwegian/errmsg.txt:
  New error message when using MATCH
sql/share/polish/errmsg.txt:
  New error message when using MATCH
sql/share/portuguese/errmsg.txt:
  New error message when using MATCH
sql/share/romanian/errmsg.txt:
  New error message when using MATCH
sql/share/russian/errmsg.txt:
  New error message when using MATCH
sql/share/slovak/errmsg.txt:
  New error message when using MATCH
sql/share/spanish/errmsg.txt:
  New error message when using MATCH
sql/share/swedish/errmsg.OLD:
  New error message when using MATCH
sql/share/swedish/errmsg.txt:
  New error message when using MATCH
This commit is contained in:
unknown
2001-08-04 00:10:00 +03:00
parent 9563e658c9
commit 9d7a659b21
31 changed files with 98 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mysql-test/t/fulltext.test
View File

@@ -2,7 +2,7 @@
# Test of fulltext index
#
drop table if exists t1,t2;
drop table if exists t1,t2,t3;
CREATE TABLE t1 (a VARCHAR(200), b TEXT, FULLTEXT (a,b));
INSERT INTO t1 VALUES('MySQL has now support', 'for full-text search'),('Full-text indexes', 'are called collections'),('Only MyISAM tables','support collections'),('Function MATCH ... AGAINST()','is used to do a search'),('Full-text search in MySQL', 'implements vector space model');
@@ -61,4 +61,23 @@ select * from t2 where MATCH inhalt AGAINST (NULL);
select * from t2 where MATCH inhalt AGAINST ('foobar');
select * from t2 having MATCH inhalt AGAINST ('foobar');
drop table t1,t2;
#
# check of fulltext errors
#
CREATE TABLE t3 (
ticket int(11),
inhalt text,
KEY tig (ticket),
fulltext index tix (inhalt)
);
--error 1210
select * from t2 having MATCH inhalt AGAINST (t1.id);
--error 1210
select * from t2 having MATCH ticket AGAINST ('foobar');
--error 1210
select * from t2,t3 having MATCH (t2.inhalt,t3.inhalt) AGAINST ('foobar');
drop table t1,t2,t3;

38
mysql-test/t/fulltext_join.test
View File

@@ -1,38 +0,0 @@
DROP TABLE IF EXISTS stories;
CREATE TABLE stories (
sid char(16) NOT NULL,
tid smallint UNSIGNED NOT NULL,
uid mediumint UNSIGNED NOT NULL,
title varchar(100) DEFAULT '' NOT NULL,
dept varchar(100),
time datetime DEFAULT '0000-00-00 00:00:00' NOT NULL,
hits mediumint UNSIGNED DEFAULT '0' NOT NULL,
section varchar(30) DEFAULT '' NOT NULL,
displaystatus tinyint DEFAULT '0' NOT NULL,
commentstatus tinyint,
discussion mediumint UNSIGNED,
submitter mediumint UNSIGNED NOT NULL,
flags set("delete_me","data_dirty") DEFAULT '' NOT NULL,
PRIMARY KEY (sid),
FOREIGN KEY (uid) REFERENCES users(uid),
FOREIGN KEY (tid) REFERENCES tid(topic),
FOREIGN KEY (section) REFERENCES sections(section),
KEY time (time),
KEY searchform (displaystatus,time)
) TYPE = myisam;
DROP TABLE IF EXISTS story_text;
CREATE TABLE story_text (
sid char(16) NOT NULL,
introtext text,
bodytext text,
relatedtext text,
FOREIGN KEY (sid) REFERENCES stories(sid),
PRIMARY KEY (sid)
) TYPE = myisam;
ALTER TABLE stories add fulltext (title);
ALTER TABLE story_text add fulltext (introtext,bodytext);
SELECT stories.sid,title, TRUNCATE((MATCH (title,introtext,bodytext)
AGAINST('install')), 1) as score FROM stories,story_text WHERE
stories.sid = story_text.sid AND MATCH (title,introtext,bodytext)
AGAINST ('install');