Commit c4baf092 authored by unknown's avatar unknown
Browse files

Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-engines 

into  xiphis.org:/home/antony/work2/mysql-5.1-engines.merge


sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
parents a005dfb6 6575e2d2

mysql-test/r/archive.result

+9 −0
Original line number Diff line number Diff line
@@ -12666,3 +12666,12 @@ t6 CREATE TABLE `t6` ( 
  KEY `a` (`a`)

) ENGINE=ARCHIVE DEFAULT CHARSET=latin1

DROP TABLE t1, t2, t4, t5, t6;

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/federated_server.result

+3 −1
Original line number Diff line number Diff line
@@ -259,8 +259,10 @@ create procedure p1 () 
begin

DECLARE v INT DEFAULT 0;

DECLARE e INT DEFAULT 0;

DECLARE i INT;

DECLARE CONTINUE HANDLER FOR SQLEXCEPTION SET e = e + 1;

WHILE v < 10000 do

SET i = sleep(5);

WHILE v < 20000 do

CREATE SERVER s

FOREIGN DATA WRAPPER mysql

OPTIONS (USER 'Remote', HOST '192.168.1.106', DATABASE 'test');

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
@@ -1540,3 +1540,13 @@ SHOW CREATE TABLE t6; 
--disable_warnings

DROP TABLE t1, t2, t4, t5, t6;

--enable_warnings



#

# 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/federated_server.test

+3 −1
Original line number Diff line number Diff line
@@ -296,8 +296,10 @@ create procedure p1 () 
begin

  DECLARE v INT DEFAULT 0;

  DECLARE e INT DEFAULT 0;

  DECLARE i INT;

  DECLARE CONTINUE HANDLER FOR SQLEXCEPTION SET e = e + 1;

  WHILE v < 10000 do

  SET i = sleep(5);

  WHILE v < 20000 do

    CREATE SERVER s

      FOREIGN DATA WRAPPER mysql

      OPTIONS (USER 'Remote', HOST '192.168.1.106', DATABASE 'test');