Commit ddaeead8 authored by unknown's avatar unknown
Browse files

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  mysql.com:/home/kent/bk/tmp4/mysql-5.0-engines


sql/item_func.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
parents d6a78be9 e8a8d5df

mysql-test/r/archive.result

+9 −0
Original line number Diff line number Diff line
@@ -12355,3 +12355,12 @@ auto fld1 companynr fld3 fld4 fld5 
4	011403	37	intercepted	audiology	tinily

4	011403	37	intercepted	audiology	tinily

drop table t1, t2, t4;

create table t1 (i int) engine=archive;

insert into t1 values (1);

repair table t1 use_frm;

Table	Op	Msg_type	Msg_text

test.t1	repair	status	OK

select * from t1;

i

1

drop table t1;

mysql-test/r/fulltext_left_join.result

+7 −0
Original line number Diff line number Diff line
@@ -90,3 +90,10 @@ id link name relevance 
1	1	string	0

2	0	string	0

DROP TABLE t1,t2;

CREATE TABLE t1 (a INT);

CREATE TABLE t2 (b INT, c TEXT, KEY(b));

INSERT INTO t1 VALUES(1);

INSERT INTO t2(b,c) VALUES(2,'castle'),(3,'castle');

SELECT * FROM t1 LEFT JOIN t2 ON a=b WHERE MATCH(c) AGAINST('+castle' IN BOOLEAN MODE);

a	b	c

DROP TABLE t1, t2;

mysql-test/t/archive.test

+10 −0
Original line number Diff line number Diff line
@@ -1364,3 +1364,13 @@ SELECT * from t2; 




drop table t1, t2, t4;



#

# BUG#26138 - REPAIR TABLE with option USE_FRM erases all records in ARCHIVE

#             table

#

create table t1 (i int) engine=archive;

insert into t1 values (1);

repair table t1 use_frm;

select * from t1;

drop table t1;

mysql-test/t/fulltext_left_join.test

+11 −0
Original line number Diff line number Diff line
@@ -87,3 +87,14 @@ SELECT t1.*, MATCH(t1.name) AGAINST('string') AS relevance 
DROP TABLE t1,t2;



# End of 4.1 tests



#

# BUG#25729 - boolean full text search is confused by NULLs produced by LEFT

#             JOIN

#

CREATE TABLE t1 (a INT);

CREATE TABLE t2 (b INT, c TEXT, KEY(b));

INSERT INTO t1 VALUES(1);

INSERT INTO t2(b,c) VALUES(2,'castle'),(3,'castle');

SELECT * FROM t1 LEFT JOIN t2 ON a=b WHERE MATCH(c) AGAINST('+castle' IN BOOLEAN MODE);

DROP TABLE t1, t2;

sql/examples/ha_example.cc

+6 −0
Original line number Diff line number Diff line
@@ -211,6 +211,12 @@ ha_example::ha_example(TABLE *table_arg) 
  If frm_error() is called then we will use this to to find out what file extentions

  exist for the storage engine. This is also used by the default rename_table and

  delete_table method in handler.cc.



  For engines that have two file name extentions (separate meta/index file

  and data file), the order of elements is relevant. First element of engine

  file name extentions array should be meta/index file extention. Second

  element - data file extention. This order is assumed by

  prepare_for_repair() when REPAIR TABLE ... USE_FRM is issued.

*/

static const char *ha_example_exts[] = {

  NullS