Commit 9ee11094 authored by serg@serg.mysql.com's avatar serg@serg.mysql.com
Browse files

Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql

parents 375be6d5 01370b46

BitKeeper/etc/logging_ok

+2 −1
Original line number Diff line number Diff line 
mwagner@evoq.mwagner.org

heikki@donna.mysql.fi

mwagner@evoq.mwagner.org

sasha@mysql.sashanet.com

serg@serg.mysql.com

Docs/manual.texi

+2 −0
Original line number Diff line number Diff line
@@ -41660,6 +41660,8 @@ not yet 100 % confident in this code. 
@appendixsubsec Changes in release 3.23.34

@itemize @bullet

@item

Improved error diagnostic for slave thread exit

@item

Fixed bug in @code{ALTER TABLE ... ORDER BY}.

@item

Added option @code{max_user_connections} to @code{mysqld}.

innobase/include/os0file.h

+8 −4
Original line number Diff line number Diff line
@@ -28,10 +28,14 @@ Created 10/21/1995 Heikki Tuuri 
#define POSIX_ASYNC_IO

#endif



#ifndef S_IRWXU

#define S_IRWXU 00700

#define S_IRWXG 00070

#define S_IRWXO 00007

#ifndef S_IRUSR

#define 

#define S_IRUSR 00400

#define S_IWUSR 00200

#define S_IRGRP 00040

#define S_IWGRP 00020

#define S_IROTH 00004

#define S_IWOTH 00002

#endif



#endif

innobase/os/os0file.c

+2 −5
Original line number Diff line number Diff line
@@ -316,11 +316,8 @@ os_file_create( 
	UT_NOT_USED(purpose);



	if (create_mode == OS_FILE_CREATE) {

#ifndef S_IRWXU

                file = open(name, create_flag);

#else

	        file = open(name, create_flag, S_IRWXU | S_IRWXG | S_IRWXO);

#endif

	        file = open(name, create_flag, S_IRUSR | S_IRGRP | S_IROTH

			                     | S_IWUSR | S_IWGRP | S_IWOTH);

        } else {

                file = open(name, create_flag);

        }

mysql-test/t/fulltext.test

+18 −0
Original line number Diff line number Diff line
@@ -45,3 +45,21 @@ select t1.id FROM t2 as ttxt,t1 INNER JOIN t1 as ticket2 ON ticket2.id = ttxt.ti 
show keys from t2;

show create table t2;

drop table t1,t2;



# check for bug reported by Stephan Skusa



drop table if exists fulltextTEST;

CREATE TABLE fulltextTEST (

   field1 varchar(40) NOT NULL,

   field2 varchar(20) NOT NULL,

   field3 varchar(40) NOT NULL,

   PRIMARY KEY (field1),

   FULLTEXT idx_fulltext (field1, field2, field3)

);



INSERT INTO fulltextTEST VALUES ( 'test1', 'test1.1', 'test1.1.1');

INSERT INTO fulltextTEST VALUES ( 'test2', 'test2.1', 'test2.1.1');

select *

from fulltextTEST

where MATCH (field1,field2,field3) AGAINST (NULL);

drop table fulltextTEST;