Commit d7e49743 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 

into neptunus.(none):/home/msvensson/mysql/mysql-4.1
parents 31d79228 1fb790d3

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ hf@bisonxp.(none) 
hf@deer.(none)

hf@deer.mysql.r18.ru

hf@genie.(none)

holyfoot@mysql.com

igor@hundin.mysql.fi

igor@linux.local

igor@rurik.mysql.com

mysql-test/t/range.test

+2 −0
Original line number Diff line number Diff line
@@ -450,6 +450,7 @@ explain select * from t1 where a='aaa' collate latin1_german1_ci; 
drop table t1;



# Test for BUG#9348 "result for WHERE A AND (B OR C) differs from WHERE a AND (C OR B)"

--disable_warnings

CREATE TABLE t1 (

  `CLIENT` char(3) character set latin1 collate latin1_bin NOT NULL default '000',

  `ARG1` char(3) character set latin1 collate latin1_bin NOT NULL default '',
@@ -458,6 +459,7 @@ CREATE TABLE t1 ( 
  `FUNCTINT` int(11) NOT NULL default '0',

  KEY `VERI_CLNT~2` (`ARG1`)

) ENGINE=InnoDB DEFAULT CHARSET=latin1;

--enable_warnings



INSERT INTO t1 VALUES ('000',' 0',' 0','Text 001',0), ('000',' 0',' 1','Text 002',0),

  ('000',' 1',' 2','Text 003',0), ('000',' 2',' 3','Text 004',0),

strings/ctype-sjis.c

+1 −1
Original line number Diff line number Diff line
@@ -4576,7 +4576,7 @@ uint my_well_formed_len_sjis(CHARSET_INFO *cs __attribute__((unused)), 
{

  const char *b0= b;

  *error= 0;

  while (pos && b < e)

  while (pos-- && b < e)

  {

    if ((uchar) b[0] < 128)

    {