Commit b69cd35a authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 

into neptunus.(none):/home/msvensson/mysql/mysql-5.0


mysql-test/t/range.test:
  Auto merged
sql/item_strfunc.h:
  Auto merged
parents 3db2d3d8 d7e49743

BUILD/check-cpu

+3 −0
Original line number Diff line number Diff line
@@ -55,6 +55,9 @@ case "$cpu_family--$model_name" in 
  *Pentium*III*CPU*)

    cpu_flag="pentium3";

  ;;

  *Pentium*M*pro*)

    cpu_flag="pentium-m";

  ;;

  *Athlon*64*)

    cpu_flag="athlon64";

    cpu_flag_old="athlon";

mysql-test/t/range.test

+2 −0
Original line number Diff line number Diff line
@@ -437,6 +437,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 '',
@@ -445,6 +446,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),

sql/item_strfunc.h

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
/* This file defines all string functions */



#ifdef USE_PRAGMA_INTERFACE

#error PRAGMA

#pragma interface			/* gcc class implementation */

#endif