Commit 15c3cbfd authored by unknown's avatar unknown
Browse files

Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1 

into hundin.mysql.fi:/home/jan/mysql-4.1
parents 4648b523 74dc0adc

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ miguel@hegel.(none) 
miguel@hegel.br

miguel@hegel.local

miguel@hegel.txg

miguel@hegel.txg.br

miguel@light.

miguel@light.local

miguel@sartre.local

libmysql/client_settings.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ extern uint mysql_port; 
extern my_string	mysql_unix_port;



#define CLIENT_CAPABILITIES (CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG |	  \

                             CLIENT_LOCAL_FILES | CLIENT_TRANSACTIONS |   \

                             CLIENT_TRANSACTIONS | \

			     CLIENT_PROTOCOL_41 | CLIENT_SECURE_CONNECTION)



sig_handler pipe_sig_handler(int sig __attribute__((unused)));

mysql-test/r/range.result

+86 −0
Original line number Diff line number Diff line
@@ -475,3 +475,89 @@ id name uid id name uid 
1025	Y	25	1025	Y	25

1026	Z	26	1026	Z	26

drop table t1,t2;

create table t1 (x bigint unsigned not null);

insert into t1(x) values (0xfffffffffffffff0);

insert into t1(x) values (0xfffffffffffffff1);

select * from t1;

x

18446744073709551600

18446744073709551601

select count(*) from t1 where x>0;

count(*)

2

select count(*) from t1 where x=0;

count(*)

0

select count(*) from t1 where x<0;

count(*)

0

select count(*) from t1 where x < -16;

count(*)

0

select count(*) from t1 where x = -16;

count(*)

0

select count(*) from t1 where x > -16;

count(*)

2

select count(*) from t1 where x = 18446744073709551601;

count(*)

1

create table t2 (x bigint not null);

insert into t2(x) values (0xfffffffffffffff0);

insert into t2(x) values (0xfffffffffffffff1);

select * from t2;

x

-16

-15

select count(*) from t2 where x>0;

count(*)

0

select count(*) from t2 where x=0;

count(*)

0

select count(*) from t2 where x<0;

count(*)

2

select count(*) from t2 where x < -16;

count(*)

0

select count(*) from t2 where x = -16;

count(*)

1

select count(*) from t2 where x > -16;

count(*)

1

select count(*) from t2 where x = 18446744073709551601;

count(*)

0

drop table t1;

create table t1 (x bigint unsigned not null primary key) engine=innodb;

insert into t1(x) values (0xfffffffffffffff0);

insert into t1(x) values (0xfffffffffffffff1);

select * from t1;

x

18446744073709551600

18446744073709551601

select count(*) from t1 where x>0;

count(*)

2

select count(*) from t1 where x=0;

count(*)

0

select count(*) from t1 where x<0;

count(*)

0

select count(*) from t1 where x < -16;

count(*)

0

select count(*) from t1 where x = -16;

count(*)

0

select count(*) from t1 where x > -16;

count(*)

1

select count(*) from t1 where x = 18446744073709551601;

count(*)

1

drop table t1;

mysql-test/t/range.test

+43 −0
Original line number Diff line number Diff line
@@ -383,3 +383,46 @@ select * from t1, t2 where t1.uid=t2.uid AND t1.uid > 0; 
select * from t1, t2  where t1.uid=t2.uid AND t1.uid != 0;



drop table t1,t2;



# Fix for bug#4488 

#

create table t1 (x bigint unsigned not null);

insert into t1(x) values (0xfffffffffffffff0);

insert into t1(x) values (0xfffffffffffffff1);

select * from t1;

select count(*) from t1 where x>0;

select count(*) from t1 where x=0;

select count(*) from t1 where x<0;

select count(*) from t1 where x < -16;

select count(*) from t1 where x = -16;

select count(*) from t1 where x > -16;

select count(*) from t1 where x = 18446744073709551601;





create table t2 (x bigint not null);

insert into t2(x) values (0xfffffffffffffff0);

insert into t2(x) values (0xfffffffffffffff1);

select * from t2;

select count(*) from t2 where x>0;

select count(*) from t2 where x=0;

select count(*) from t2 where x<0;

select count(*) from t2 where x < -16;

select count(*) from t2 where x = -16;

select count(*) from t2 where x > -16;

select count(*) from t2 where x = 18446744073709551601;



drop table t1;

create table t1 (x bigint unsigned not null primary key) engine=innodb;

insert into t1(x) values (0xfffffffffffffff0);

insert into t1(x) values (0xfffffffffffffff1);

select * from t1;

select count(*) from t1 where x>0;

select count(*) from t1 where x=0;

select count(*) from t1 where x<0;

select count(*) from t1 where x < -16;

select count(*) from t1 where x = -16;

select count(*) from t1 where x > -16;

select count(*) from t1 where x = 18446744073709551601;



drop table t1;

ndb/include/ndb_global.h

+3 −1
Original line number Diff line number Diff line
@@ -3,9 +3,11 @@ 
#define NDBGLOBAL_H



#include <my_global.h>



#define NDB_BASE_PORT 2200



/** signal & SIG_PIPE */

#include <my_alarm.h>



#if defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(WIN32)

#define NDB_WIN32

#else