mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source 
Docs/manual.texi:
  SCCS merged
This commit is contained in:
unknown 2002-06-14 15:15:24 +03:00
commit 52eab5dca2
4 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Docs/manual.texi
View file

@ -49456,6 +49456,8 @@ Our TODO section contains what we plan to have in 4.0. @xref{TODO MySQL 4.0}.
@itemize @bullet @itemize @bullet
@item @item
Fixed a rare bug when fulltext index is present and no tables are used
@item
Added privileges @code{CREATE TEMPORARY TABLES}, @code{LOCK TABLES}, Added privileges @code{CREATE TEMPORARY TABLES}, @code{LOCK TABLES},
@code{REPLICATION CLIENT}, @code{REPLICATION SLAVE}, @code{REPLICATION CLIENT}, @code{REPLICATION SLAVE},
@code{SHOW DATABASES} and @code{SUPER}. To use these, you must have @code{SHOW DATABASES} and @code{SUPER}. To use these, you must have

9
mysql-test/r/fulltext.result
View file

@ -192,3 +192,12 @@ a b
2 fullaaa fullzzz 2 fullaaa fullzzz
1 I wonder why the fulltext index doesnt work? 1 I wonder why the fulltext index doesnt work?
drop table t1; 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;

4
mysql-test/t/fulltext.test
View file

@ -154,4 +154,8 @@ insert into t1 values (2,"fullaaa fullzzz");
select * from t1 where match b against ('full*' in boolean mode); select * from t1 where match b against ('full*' in boolean mode);
drop table t1; 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;
drop table t1;

7
sql/sql_select.cc
View file

@ -257,7 +257,14 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds,
} }
TABLE_LIST *table; TABLE_LIST *table;
for (table=tables ; table ; table=table->next) for (table=tables ; table ; table=table->next)
{
join.tables++; join.tables++;
if (!thd->used_tables)
{
TABLE *tbl=table->table;
tbl->keys_in_use_for_query=tbl->used_keys= tbl->keys_in_use=0;
}
}
} }
procedure=setup_procedure(thd,proc_param,result,fields,&error); procedure=setup_procedure(thd,proc_param,result,fields,&error);
if (error) if (error)