database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

broken merge, fix required

Browse Source 
Docs/manual.texi:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
innobase/btr/btr0btr.c:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
configure.in:
  no merge - used local
mysql-test/r/fulltext.result:
  no merge - used local
mysql-test/r/myisam.result:
  no merge - used local
sql/item_func.cc:
  no merge - used local
sql/sql_delete.cc:
  no merge - used local
sql/sql_parse.cc:
  no merge - used local
sql/sql_select.cc:
  no merge - used local
This commit is contained in:
unknown
2001-11-21 19:08:33 +01:00
parent 9edd1e7175 dfbeb93550
commit d237b46bf5
13 changed files with 119 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,6 +23,9 @@ select * from t1 where MATCH(a,b) AGAINST("+search +(support vector)" IN BOOLEAN
select * from t1 where MATCH(a,b) AGAINST("+search -(support vector)" IN BOOLEAN MODE);
select *, MATCH(a,b) AGAINST("support collections" IN BOOLEAN MODE) as x from t1;
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;
drop table t1;
#

12
mysql-test/t/myisam.test
View File

@@ -38,3 +38,15 @@ check table t1;
repair table t1;
check table t1;
drop table t1;
#
# Test bug: Two optimize in a row reset index cardinality
#
create table t1 (a int not null auto_increment, b int not null, primary key (a), index(b));
insert into t1 (b) values (1),(2),(2),(2),(2);
optimize table t1;
show index from t1;
optimize table t1;
show index from t1;
drop table t1;