mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 19:11:46 +01:00
b388eb004d
bmove_allign -> bmove_align Added OLAP function ROLLUP Split mysql_fix_privilege_tables to a script and a .sql data file Added new (MEMROOT*) functions to avoid calling current_thd() when creating some common objects. Added table_alias_charset, for easier --lower-case-table-name handling Better SQL_MODE handling (Setting complex options also sets sub options) New (faster) assembler string functions for x86 BitKeeper/etc/ignore: added libmysqld/sql_state.c client/mysql.cc: Added SQLSTATE to error messages Added new function put_error() to be able to clean up some old code. client/mysqltest.c: Write ERROR SQLSTATE for all errors dbug/dbug.c: Portability fixes include/m_string.h: Rename bmove_allign as bmove_align include/mysql.h: Added SQLSTATE (for embedded version) include/mysql_com.h: Send correct SQLSTATE for the error to the client libmysql/libmysql.c: Changed default error state to HY000 Applied code cleanup patch libmysqld/Makefile.am: Added sql_state.cc libmysqld/libmysqld.c: Added sqlstate mysql-test/r/analyse.result: Updated results mysql-test/r/ansi.result: Updated results mysql-test/r/auto_increment.result: Updated results mysql-test/r/bdb-deadlock.result: Updated results mysql-test/r/bdb.result: Updated results mysql-test/r/comments.result: Updated results mysql-test/r/create.result: Updated results mysql-test/r/ctype_collate.result: Updated results mysql-test/r/delayed.result: Updated results mysql-test/r/delete.result: Updated results mysql-test/r/derived.result: Updated results mysql-test/r/distinct.result: Updated results mysql-test/r/drop.result: Updated results mysql-test/r/err000001.result: Updated results mysql-test/r/explain.result: Updated results mysql-test/r/flush.result: Updated results mysql-test/r/fulltext.result: Updated results mysql-test/r/func_gconcat.result: Updated results mysql-test/r/func_system.result: Updated results mysql-test/r/grant_cache.result: Updated results mysql-test/r/group_by.result: Updated results mysql-test/r/handler.result: Updated results mysql-test/r/heap.result: Updated results mysql-test/r/heap_btree.result: Updated results mysql-test/r/heap_hash.result: Updated results mysql-test/r/innodb.result: Updated results mysql-test/r/innodb_handler.result: Updated results mysql-test/r/insert_select.result: Updated results mysql-test/r/insert_update.result: Updated results mysql-test/r/join.result: Updated results mysql-test/r/join_outer.result: Updated results mysql-test/r/key.result: Updated results mysql-test/r/lock.result: Updated results mysql-test/r/lock_multi.result: Updated results mysql-test/r/merge.result: Updated results mysql-test/r/multi_update.result: Updated results mysql-test/r/myisam.result: Updated results mysql-test/r/null.result: Updated results mysql-test/r/olap.result: Updated results mysql-test/r/order_by.result: Updated results mysql-test/r/packet.result: Updated results mysql-test/r/query_cache.result: Updated results mysql-test/r/row.result: Updated results mysql-test/r/rpl000001.result: Updated results mysql-test/r/rpl000009.result: Updated results mysql-test/r/rpl_empty_master_crash.result: Updated results mysql-test/r/rpl_log.result: Updated results mysql-test/r/rpl_replicate_do.result: Updated results mysql-test/r/rpl_rotate_logs.result: Updated results mysql-test/r/select.result: Updated results mysql-test/r/select_safe.result: Updated results mysql-test/r/show_check.result: Updated results mysql-test/r/sql_mode.result: Updated results mysql-test/r/subselect.result: Updated results mysql-test/r/temp_table.result: Updated results mysql-test/r/truncate.result: Updated results mysql-test/r/type_blob.result: Updated results mysql-test/r/type_decimal.result: Updated results mysql-test/r/type_float.result: Updated results mysql-test/r/type_ranges.result: Updated results mysql-test/r/union.result: Updated results mysql-test/r/update.result: Updated results mysql-test/r/user_var.result: Updated results mysql-test/r/varbinary.result: Updated results mysql-test/r/variables.result: Updated results mysql-test/t/ansi.test: Test of sql_mode mysql-test/t/derived.test: Updated results mysql-test/t/func_system.test: Make this independen of the MySQL server name mysql-test/t/lowercase_table.test: Cleanup mysql-test/t/olap.test: A lot of new tests mysql-test/t/sql_mode.test: More test for sql_mode mysql-test/t/subselect.test: Added a few new tests (to find a bug in the item_ref code) scripts/Makefile.am: Added mysql_fix_privilege_tables.sql scripts/mysql_fix_privilege_tables.sh: Totally new script. This bascily just pipes mysql_fix_privilege_tables.sql through 'mysql' to 'mysqld' sql/Makefile.am: Added sql_state.cc sql/item.cc: Extended Item_field::eq() to be able to better match GROUP BY fields on the command line. Needed for ROLLUP sql/item.h: Added function to be able to avoid calling current_thd() when doing new Item. sql/item_sum.cc: Moved copy_or_same() and some reset() functions from item_sum.h Needed to be able to access thd->mem_root. sql/item_sum.h: Moved some functions to item_sum.cc Added make_unique() for ROLLUP sql/item_uniq.h: Fixed return value sql/mysql_priv.h: Updated MODE flags sql/mysqld.cc: Added ANSI as it's own mode Moved charset_info variables here Cleaned up handler_count handling (for NT) Added table_alias_charset, for easier --lower-case-table-name handling sql/net_serv.cc: New comment sql/protocol.cc: Send SQLSTATE to client sql/set_var.cc: Better SQL_MODE handling (Setting complex options also sets sub options) sql/set_var.h: Better SQL_MODE handling sql/sql_base.cc: Make alias depend on --lower-case-table-names Make find_item_in_list also check database name sql/sql_cache.cc: Indentation cleanup sql/sql_list.h: Added safety assert Addes support of alloc without current_thd() sql/sql_prepare.cc: Update after prototype change sql/sql_select.cc: Added ROLLUP sql/sql_select.h: structures for rollup sql/sql_show.cc: Easier SQL_MODE handling sql/sql_string.cc: Move CHARSET_INFO to mysqld (to be together with all other global variables) sql/sql_string.h: Added function to be able to avoid calling current_thd() when doing new Item. sql/sql_table.cc: Simpler --lower-case-table-name handling sql/sql_union.cc: Update after prototype change sql/sql_yacc.yy: ROLLUP sql/unireg.h: bmove_allign ->bmove_align strings/Makefile.am: Fix to be able to compile str_test.c strings/ctype.c: Removed empty lines strings/str_test.c: Added test of bmove_align strings/strings-x86.s: Faster bmove_align, bmove_upp and strmake strings/strings.asm: move_allg
228 lines
8.2 KiB
Text
228 lines
8.2 KiB
Text
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');
|
|
select * from t1 where MATCH(a,b) AGAINST ("collections");
|
|
a b
|
|
Only MyISAM tables support collections
|
|
Full-text indexes are called collections
|
|
select * from t1 where MATCH(a,b) AGAINST ("indexes");
|
|
a b
|
|
Full-text indexes are called collections
|
|
select * from t1 where MATCH(a,b) AGAINST ("indexes collections");
|
|
a b
|
|
Full-text indexes are called collections
|
|
Only MyISAM tables support collections
|
|
select * from t1 where MATCH(a,b) AGAINST ("only");
|
|
a b
|
|
select * from t1 where MATCH(a,b) AGAINST ("collections") UNION ALL select * from t1 where MATCH(a,b) AGAINST ("indexes");
|
|
a b
|
|
Only MyISAM tables support collections
|
|
Full-text indexes are called collections
|
|
Full-text indexes are called collections
|
|
select * from t1 where MATCH(a,b) AGAINST("support -collections" IN BOOLEAN MODE);
|
|
a b
|
|
MySQL has now support for full-text search
|
|
select * from t1 where MATCH(a,b) AGAINST("support collections" IN BOOLEAN MODE);
|
|
a b
|
|
MySQL has now support for full-text search
|
|
Full-text indexes are called collections
|
|
Only MyISAM tables support collections
|
|
select * from t1 where MATCH(a,b) AGAINST("support +collections" IN BOOLEAN MODE);
|
|
a b
|
|
Full-text indexes are called collections
|
|
Only MyISAM tables support collections
|
|
select * from t1 where MATCH(a,b) AGAINST("sear*" IN BOOLEAN MODE);
|
|
a b
|
|
MySQL has now support for full-text search
|
|
Function MATCH ... AGAINST() is used to do a search
|
|
Full-text search in MySQL implements vector space model
|
|
select * from t1 where MATCH(a,b) AGAINST("+support +collections" IN BOOLEAN MODE);
|
|
a b
|
|
Only MyISAM tables support collections
|
|
select * from t1 where MATCH(a,b) AGAINST("+search" IN BOOLEAN MODE);
|
|
a b
|
|
MySQL has now support for full-text search
|
|
Function MATCH ... AGAINST() is used to do a search
|
|
Full-text search in MySQL implements vector space model
|
|
select * from t1 where MATCH(a,b) AGAINST("+search +(support vector)" IN BOOLEAN MODE);
|
|
a b
|
|
MySQL has now support for full-text search
|
|
Full-text search in MySQL implements vector space model
|
|
select * from t1 where MATCH(a,b) AGAINST("+search -(support vector)" IN BOOLEAN MODE);
|
|
a b
|
|
Function MATCH ... AGAINST() is used to do a search
|
|
select *, MATCH(a,b) AGAINST("support collections" IN BOOLEAN MODE) as x from t1;
|
|
a b x
|
|
MySQL has now support for full-text search 1
|
|
Full-text indexes are called collections 1
|
|
Only MyISAM tables support collections 2
|
|
Function MATCH ... AGAINST() is used to do a search 0
|
|
Full-text search in MySQL implements vector space model 0
|
|
select *, MATCH(a,b) AGAINST("collections support" IN BOOLEAN MODE) as x from t1;
|
|
a b x
|
|
MySQL has now support for full-text search 1
|
|
Full-text indexes are called collections 1
|
|
Only MyISAM tables support collections 2
|
|
Function MATCH ... AGAINST() is used to do a search 0
|
|
Full-text search in MySQL implements vector space model 0
|
|
select * from t1 where MATCH a,b AGAINST ("+call* +coll*" IN BOOLEAN MODE);
|
|
a b
|
|
Full-text indexes are called collections
|
|
select * from t1 where MATCH a,b AGAINST ('"support now"' IN BOOLEAN MODE);
|
|
a b
|
|
select * from t1 where MATCH a,b AGAINST ('"Now sUPPort"' IN BOOLEAN MODE);
|
|
a b
|
|
MySQL has now support for full-text search
|
|
select * from t1 where MATCH a,b AGAINST ('"text search" "now support"' IN BOOLEAN MODE);
|
|
a b
|
|
MySQL has now support for full-text search
|
|
Full-text search in MySQL implements vector space model
|
|
select * from t1 where MATCH a,b AGAINST ('"text search" -"now support"' IN BOOLEAN MODE);
|
|
a b
|
|
Full-text search in MySQL implements vector space model
|
|
select * from t1 where MATCH a,b AGAINST ('"text search" +"now support"' IN BOOLEAN MODE);
|
|
a b
|
|
MySQL has now support for full-text search
|
|
select * from t1 where MATCH a,b AGAINST ('"text i"' IN BOOLEAN MODE);
|
|
a b
|
|
Full-text indexes are called collections
|
|
select * from t1 where MATCH a AGAINST ("search" IN BOOLEAN MODE);
|
|
a b
|
|
Full-text search in MySQL implements vector space model
|
|
select * from t1 where MATCH b AGAINST ("sear*" IN BOOLEAN MODE);
|
|
a b
|
|
MySQL has now support for full-text search
|
|
Function MATCH ... AGAINST() is used to do a search
|
|
delete from t1 where a like "MySQL%";
|
|
update t1 set a='some test foobar' where MATCH a,b AGAINST ('model');
|
|
delete from t1 where MATCH(a,b) AGAINST ("indexes");
|
|
select * from t1;
|
|
a b
|
|
Only MyISAM tables support collections
|
|
Function MATCH ... AGAINST() is used to do a search
|
|
some test foobar implements vector space model
|
|
drop table t1;
|
|
CREATE TABLE t1 (
|
|
id int(11),
|
|
ticket int(11),
|
|
KEY ti (id),
|
|
KEY tit (ticket)
|
|
);
|
|
INSERT INTO t1 VALUES (2,3),(1,2);
|
|
CREATE TABLE t2 (
|
|
ticket int(11),
|
|
inhalt text,
|
|
KEY tig (ticket),
|
|
fulltext index tix (inhalt)
|
|
);
|
|
INSERT INTO t2 VALUES (1,'foo'),(2,'bar'),(3,'foobar');
|
|
select t1.id FROM t2 as ttxt,t1,t1 as ticket2
|
|
WHERE ticket2.id = ttxt.ticket AND t1.id = ticket2.ticket and
|
|
match(ttxt.inhalt) against ('foobar');
|
|
id
|
|
select t1.id FROM t2 as ttxt,t1 INNER JOIN t1 as ticket2 ON
|
|
ticket2.id = ttxt.ticket
|
|
WHERE t1.id = ticket2.ticket and match(ttxt.inhalt) against ('foobar');
|
|
id
|
|
INSERT INTO t1 VALUES (3,3);
|
|
select t1.id FROM t2 as ttxt,t1
|
|
INNER JOIN t1 as ticket2 ON ticket2.id = ttxt.ticket
|
|
WHERE t1.id = ticket2.ticket and
|
|
match(ttxt.inhalt) against ('foobar');
|
|
id
|
|
3
|
|
show keys from t2;
|
|
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment
|
|
t2 1 tig 1 ticket A NULL NULL NULL YES BTREE
|
|
t2 1 tix 1 inhalt A NULL 1 NULL YES FULLTEXT
|
|
show create table t2;
|
|
Table Create Table
|
|
t2 CREATE TABLE `t2` (
|
|
`ticket` int(11) default NULL,
|
|
`inhalt` text,
|
|
KEY `tig` (`ticket`),
|
|
FULLTEXT KEY `tix` (`inhalt`)
|
|
) TYPE=MyISAM CHARSET=latin1
|
|
select * from t2 where MATCH inhalt AGAINST (NULL);
|
|
ticket inhalt
|
|
select * from t2 where MATCH inhalt AGAINST ('foobar');
|
|
ticket inhalt
|
|
3 foobar
|
|
select * from t2 having MATCH inhalt AGAINST ('foobar');
|
|
ticket inhalt
|
|
3 foobar
|
|
CREATE TABLE t3 (
|
|
ticket int(11),
|
|
inhalt text,
|
|
KEY tig (ticket),
|
|
fulltext index tix (inhalt)
|
|
);
|
|
select * from t2 where MATCH inhalt AGAINST (t2.inhalt);
|
|
ERROR HY000: Wrong arguments to AGAINST
|
|
select * from t2 where MATCH ticket AGAINST ('foobar');
|
|
ERROR HY000: Can't find FULLTEXT index matching the column list
|
|
select * from t2,t3 where MATCH (t2.inhalt,t3.inhalt) AGAINST ('foobar');
|
|
ERROR HY000: 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');
|
|
select * from t1 where match title against ('test' in boolean mode);
|
|
id title
|
|
1 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
|
|
update t1 set title=NULL where id=1;
|
|
drop table t1;
|
|
CREATE TABLE t1 (a int(11), b text, FULLTEXT KEY (b)) TYPE=MyISAM;
|
|
insert into t1 values (1,"I wonder why the fulltext index doesnt work?");
|
|
SELECT * from t1 where MATCH (b) AGAINST ('apples');
|
|
a b
|
|
insert into t1 values (2,"fullaaa fullzzz");
|
|
select * from t1 where match b against ('full*' in boolean mode);
|
|
a b
|
|
2 fullaaa fullzzz
|
|
1 I wonder why the fulltext index doesnt work?
|
|
drop table t1;
|
|
CREATE TABLE t1 ( id int(11) NOT NULL auto_increment primary key, mytext text NOT NULL, FULLTEXT KEY mytext (mytext)) TYPE=MyISAM;
|
|
INSERT INTO t1 VALUES (1,'my small mouse'),(2,'la-la-la'),(3,'It is so funny'),(4,'MySQL Tutorial');
|
|
select 8 from t1;
|
|
8
|
|
8
|
|
8
|
|
8
|
|
8
|
|
drop table t1;
|
|
create table t1 (a text, fulltext key (a));
|
|
insert into t1 values ('aaaa');
|
|
repair table t1;
|
|
Table Op Msg_type Msg_text
|
|
test.t1 repair status OK
|
|
select * from t1 where match (a) against ('aaaa');
|
|
a
|
|
drop table t1;
|
|
create table t1 ( ref_mag text not null, fulltext (ref_mag));
|
|
insert into t1 values ('test');
|
|
select ref_mag from t1 where match ref_mag against ('+test' in boolean mode);
|
|
ref_mag
|
|
test
|
|
alter table t1 change ref_mag ref_mag char (255) not null;
|
|
select ref_mag from t1 where match ref_mag against ('+test' in boolean mode);
|
|
ref_mag
|
|
test
|
|
drop table t1;
|