Commit 4cf9fc59 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/space/my/mysql-4.0 

into mysql.com:/space/my/mysql-4.0-build
parents f82898f1 acf5df3a

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ Administrator@fred. 
Greg@greg-laptop.

Miguel@light.local

Sinisa@sinisa.nasamreza.org

acurtis@pcgem.rdg.cyberkinetica.com

ahlentz@co3064164-a.rochd1.qld.optusnet.com.au

akishkin@work.mysql.com

antony@ltantony.dsl-verizon.net

include/my_global.h

+17 −11
Original line number Diff line number Diff line
@@ -642,21 +642,27 @@ extern double my_atof(const char*); 
#endif /* defined (HAVE_LONG_LONG) && !defined(ULONGLONG_MAX)*/



#if SIZEOF_LONG == 4

#define INT_MIN32	(long) 0x80000000L

#define INT_MAX32	(long) 0x7FFFFFFFL

#define INT_MIN24	((long) 0xff800000L)

#define INT_MAX24	0x007fffffL

#define INT_MIN32       ((long) 0x80000000L)

#define INT_MAX32       ((long) 0x7FFFFFFFL)

#define UINT_MAX32      ((long) 0xFFFFFFFFL)

#define INT_MIN24       ((long) 0xFF800000L)

#define INT_MAX24       0x007FFFFFL

#define UINT_MAX24      0x00FFFFFFL

#define INT_MIN16       ((short int) 0x8000)

#define INT_MAX16       0x7FFF

#define UINT_MAX16      0xFFFF

#define INT_MIN8        ((char) 0x80)

#define INT_MAX8        ((char) 0x7F)

#else  /* Probably Alpha */

#define INT_MIN32	((long) (int) 0x80000000)

#define INT_MAX32	((long) (int) 0x7FFFFFFF)

#define INT_MIN24	((long) (int) 0xff800000)

#define INT_MAX24	((long) (int) 0x007fffff)

#define INT_MIN16	((short int) 0xffff8000)

#define UINT_MAX32	((long) (int) 0xFFFFFFFF)

#define INT_MIN24	((long) (int) 0xFF800000)

#define INT_MAX24	((long) (int) 0x007FFFFF)

#define UINT_MAX24	((long) (int) 0x00FFFFFF)

#define INT_MIN16	((short int) 0xFFFF8000)

#define INT_MAX16	((short int) 0x00007FFF)

#define UINT_MAX16      ((short int) 0x0000FFFF)

#endif



/* From limits.h instead */

mysql-test/r/heap.result

+10 −0
Original line number Diff line number Diff line
@@ -217,3 +217,13 @@ DELETE from t1 where a < 100; 
SELECT * from t1;

a

DROP TABLE t1;

CREATE TABLE `job_titles` (

`job_title_id` int(6) unsigned NOT NULL default '0',

`job_title` char(18) NOT NULL default '',

PRIMARY KEY  (`job_title_id`),

UNIQUE KEY `job_title_id` (`job_title_id`,`job_title`)

) TYPE=HEAP;

SELECT MAX(job_title_id) FROM job_titles;

MAX(job_title_id)

NULL

DROP TABLE job_titles;

mysql-test/r/type_uint.result

+2 −0
Original line number Diff line number Diff line
@@ -2,8 +2,10 @@ drop table if exists t1; 
create table t1 (this int unsigned);

insert into t1 values (1);

insert into t1 values (-1);

insert into t1 values ('5000000000');

select * from t1;

this

1

0

4294967295

drop table t1;

mysql-test/t/heap.test

+14 −0
Original line number Diff line number Diff line
@@ -147,3 +147,17 @@ INSERT into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11); 
DELETE from t1 where a < 100;

SELECT * from t1;

DROP TABLE t1;



#

# Bug#4411 Server hangs when trying to SELECT MAX(id) from an empty HEAP table

#

CREATE TABLE `job_titles` (

  `job_title_id` int(6) unsigned NOT NULL default '0',

  `job_title` char(18) NOT NULL default '',

  PRIMARY KEY  (`job_title_id`),

  UNIQUE KEY `job_title_id` (`job_title_id`,`job_title`)

) TYPE=HEAP;



SELECT MAX(job_title_id) FROM job_titles;



DROP TABLE job_titles;