Commit 15efd716 authored by unknown's avatar unknown
Browse files

Merge bk@192.168.21.1:/usr/home/bk/mysql-4.0 

into deer.(none):/home/hf/work/mysql-4.0.12177
parents 7e7bd6a4 21fefc68

myisam/sort.c

+8 −6
Original line number Diff line number Diff line
@@ -532,11 +532,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_MAXLEN + 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/fulltext.result

+8 −0
Original line number Diff line number Diff line
@@ -321,3 +321,11 @@ SELECT MATCH(a) AGAINST ('nosuchword') FROM t1; 
MATCH(a) AGAINST ('nosuchword')

0

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/fulltext.test

+11 −0
Original line number Diff line number Diff line
@@ -260,3 +260,14 @@ CREATE TABLE t1 ( a TEXT, FULLTEXT (a) ); 
INSERT INTO t1 VALUES ('testing ft_nlq_find_relevance');

SELECT MATCH(a) AGAINST ('nosuchword') FROM t1;

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;

sql/ha_innodb.cc

+2 −1
Original line number Diff line number Diff line
@@ -4928,7 +4928,8 @@ ha_innobase::store_lock( 
	    (lock_type == TL_READ_HIGH_PRIORITY && thd->in_lock_tables) ||

	    lock_type == TL_READ_WITH_SHARED_LOCKS ||

	    lock_type == TL_READ_NO_INSERT ||

	    thd->lex.sql_command != SQLCOM_SELECT) {

	    (thd->lex.sql_command != SQLCOM_SELECT

	     && lock_type != TL_IGNORE)) {



		/* The OR cases above are in this order:

		1) MySQL is doing LOCK TABLES ... READ LOCAL, or

support-files/mysql.spec.sh

+6 −1
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ fi 


# Create a MySQL user and group. Do not report any problems if it already

# exists.

groupadd -r -c "MySQL server" %{mysqld_user} 2> /dev/null || true

groupadd -r %{mysqld_user} 2> /dev/null || true

useradd -M -r -d $mysql_datadir -s /bin/bash -c "MySQL server" -g %{mysqld_user} %{mysqld_user} 2> /dev/null || true 



# Change permissions so that the user that will run the MySQL daemon
@@ -562,6 +562,11 @@ fi 
# itself - note that they must be ordered by date (important when

# merging BK trees)

%changelog 

* Thu Aug 04 2005 Lenz Grimmer <lenz@mysql.com>



- Fixed the creation of the mysql user group account in the postinstall

  section (BUG 12348)



* Fri Jul 15 2005 Lenz Grimmer <lenz@mysql.com>



- create a "mysql" user group and assign the mysql user account to that group