Commit 3f216c7d authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/mysql-5.0
parents 1dcfe028 03ad365b

myisam/ft_update.c

+4 −0
Original line number Diff line number Diff line
@@ -168,6 +168,10 @@ int _mi_ft_cmp(MI_INFO *info, uint keynr, const byte *rec1, const byte *rec2) 
  FT_SEG_ITERATOR ftsi1, ftsi2;

  CHARSET_INFO *cs=info->s->keyinfo[keynr].seg->charset;

  DBUG_ENTER("_mi_ft_cmp");

#ifndef MYSQL_HAS_TRUE_CTYPE_IMPLEMENTATION

  if (cs->mbmaxlen > 1)

    DBUG_RETURN(THOSE_TWO_DAMN_KEYS_ARE_REALLY_DIFFERENT);

#endif



  _mi_ft_segiterator_init(info, keynr, rec1, &ftsi1);

  _mi_ft_segiterator_init(info, keynr, rec2, &ftsi2);

mysql-test/r/fulltext2.result

+5 −0
Original line number Diff line number Diff line
@@ -234,5 +234,10 @@ insert into t1 values('test test '),('test'),('test'),('test'), 
('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),

('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test');

delete from t1 limit 1;

truncate table t1;

insert into t1 values('ab c d');

update t1 set a='ab c d';

select * from t1 where match a against('ab c' in boolean mode);

a

drop table t1;

set names latin1;

mysql-test/t/fulltext2.test

+8 −0
Original line number Diff line number Diff line
@@ -209,6 +209,14 @@ insert into t1 values('test test '),('test'),('test'),('test'), 
('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),

('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test');

delete from t1 limit 1;



#

# BUG#16489: utf8 + fulltext leads to corrupt index file.

#

truncate table t1;

insert into t1 values('ab c d');

update t1 set a='ab c d';

select * from t1 where match a against('ab c' in boolean mode);

drop table t1;

set names latin1;

zlib/Makefile.am

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


# Process this file with automake to create Makefile.in



INCLUDES=		-I$(top_builddir)/include -I$(top_srcdir)/include



pkglib_LTLIBRARIES=libz.la



libz_la_LDFLAGS= -version-info 3:3:2

zlib/README.MySQL

+9 −0
Original line number Diff line number Diff line
@@ -5,3 +5,12 @@ original zlib distribution. You can find the original distribution at 
  http://www.gzip.org/zlib/ 

  or

  http://www.zlib.net/



Revision history:



20.01.2006. The following files were changed as part of #15787 fix:

 makefile.am

 gzio.c

 zconf.h

 README.mysql