Commit 7c7843a2 authored by unknown's avatar unknown
Browse files

Manual merge 


myisam/sort.c:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
parents 6eb7a80a c2b83502

myisam/sort.c

+8 −6
Original line number Diff line number Diff line
@@ -587,11 +587,13 @@ int thr_write_keys(MI_SORT_PARAM *sort_param) 


      while (!got_error &&

	     !my_b_read(&sinfo->tempfile_for_exceptions,(byte*)&key_length,

			sizeof(key_length)) &&

	     !my_b_read(&sinfo->tempfile_for_exceptions,(byte*)mergebuf,

			(uint) key_length))

			sizeof(key_length)))

      {

	if (_mi_ck_write(info,sinfo->key,(uchar*) mergebuf,

        byte ft_buf[HA_FT_MAXBYTELEN + HA_FT_WLEN + 10];

        if (key_length > sizeof(ft_buf) ||

            my_b_read(&sinfo->tempfile_for_exceptions, (byte*)ft_buf,

                      (uint)key_length) ||

            _mi_ck_write(info, sinfo->key, (uchar*)ft_buf,

                         key_length - info->s->rec_reflength))

          got_error=1;

      }

mysql-test/r/ctype_big5.result

+6 −0
Original line number Diff line number Diff line
@@ -128,3 +128,9 @@ SELECT * FROM t1; 
a



DROP TABLE t1;

CREATE TABLE t1 (a CHAR(50) CHARACTER SET big5 NOT NULL, FULLTEXT(a));

INSERT INTO t1 VALUES(0xA741ADCCA66EB6DC20A7DAADCCABDCA66E);

SELECT HEX(a) FROM t1 WHERE MATCH(a) AGAINST (0xA741ADCCA66EB6DC IN BOOLEAN MODE);

HEX(a)

A741ADCCA66EB6DC20A7DAADCCABDCA66E

DROP TABLE t1;

mysql-test/r/fulltext.result

+8 −0
Original line number Diff line number Diff line
@@ -422,3 +422,11 @@ SELECT COUNT(*) FROM t1 WHERE MATCH(t) AGAINST ('"osnabr 
COUNT(*)

1

DROP TABLE t1;

CREATE TABLE t1 (a VARCHAR(30), FULLTEXT(a));

INSERT INTO t1 VALUES('bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb');

SET myisam_repair_threads=2;

REPAIR TABLE t1;

Table	Op	Msg_type	Msg_text

test.t1	repair	status	OK

SET myisam_repair_threads=@@global.myisam_repair_threads;

DROP TABLE t1;

mysql-test/t/ctype_big5.test

+8 −0
Original line number Diff line number Diff line
@@ -28,4 +28,12 @@ INSERT INTO t1 VALUES (' 
SELECT * FROM t1;

DROP TABLE t1;



#

# BUG#12075 - FULLTEXT non-functional for big5 strings

#

CREATE TABLE t1 (a CHAR(50) CHARACTER SET big5 NOT NULL, FULLTEXT(a));

INSERT INTO t1 VALUES(0xA741ADCCA66EB6DC20A7DAADCCABDCA66E);

SELECT HEX(a) FROM t1 WHERE MATCH(a) AGAINST (0xA741ADCCA66EB6DC IN BOOLEAN MODE);

DROP TABLE t1;



# End of 4.1 tests

mysql-test/t/fulltext.test

+11 −0
Original line number Diff line number Diff line
@@ -339,4 +339,15 @@ INSERT INTO t1 VALUES('Mit freundlichem Gr 
SELECT COUNT(*) FROM t1 WHERE MATCH(t) AGAINST ('"osnabrck"' IN BOOLEAN MODE);

DROP TABLE t1;



#

# BUG#11684 - repair crashes mysql when table has fulltext index

#



CREATE TABLE t1 (a VARCHAR(30), FULLTEXT(a));

INSERT INTO t1 VALUES('bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb');

SET myisam_repair_threads=2;

REPAIR TABLE t1;

SET myisam_repair_threads=@@global.myisam_repair_threads;

DROP TABLE t1;



# End of 4.1 tests