Commit 129300f1 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


client/mysqltest.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
mysql-test/t/func_group.test:
  Auto merged
mysql-test/t/loaddata.test:
  Auto merged
mysql-test/t/type_decimal.test:
  Auto merged
mysql-test/t/union.test:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/r/func_group.result:
  Manual merge
mysql-test/r/loaddata.result:
  Manual merge
mysql-test/r/type_decimal.result:
  Manual merge
mysql-test/r/union.result:
  Manual merge
sql/field_conv.cc:
  aborting fix for 7589
sql/opt_sum.cc:
  Manual merge
sql/sql_load.cc:
  Manual merge
sql/sql_yacc.yy:
  Aborting fix for 11553
parents abda6dc6 727f0b8a

mysql-test/r/func_group.result

+136 −0
Original line number Diff line number Diff line
@@ -821,6 +821,142 @@ SELECT MAX(id) FROM t1 WHERE id < 3 AND a=2 AND b=6; 
MAX(id)

NULL

DROP TABLE t1;

create table t1m (a int) engine=myisam;

create table t1i (a int) engine=innodb;

create table t2m (a int) engine=myisam;

create table t2i (a int) engine=innodb;

insert into t2m values (5);

insert into t2i values (5);

select min(a) from t1m;

min(a)

NULL

select min(7) from t1m;

min(7)

NULL

select min(7) from DUAL;

min(7)

NULL

explain select min(7) from t2m join t1m;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Select tables optimized away

select min(7) from t2m join t1m;

min(7)

NULL

select max(a) from t1m;

max(a)

NULL

select max(7) from t1m;

max(7)

NULL

select max(7) from DUAL;

max(7)

NULL

explain select max(7) from t2m join t1m;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Select tables optimized away

select max(7) from t2m join t1m;

max(7)

NULL

select 1, min(a) from t1m where a=99;

1	min(a)

1	NULL

select 1, min(a) from t1m where 1=99;

1	min(a)

1	NULL

select 1, min(1) from t1m where a=99;

1	min(1)

select 1, min(1) from t1m where 1=99;

1	min(1)

1	NULL

select 1, max(a) from t1m where a=99;

1	max(a)

1	NULL

select 1, max(a) from t1m where 1=99;

1	max(a)

1	NULL

select 1, max(1) from t1m where a=99;

1	max(1)

select 1, max(1) from t1m where 1=99;

1	max(1)

1	NULL

select min(a) from t1i;

min(a)

NULL

select min(7) from t1i;

min(7)

NULL

select min(7) from DUAL;

min(7)

NULL

explain select min(7) from t2i join t1i;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2i	ALL	NULL	NULL	NULL	NULL	1	

1	SIMPLE	t1i	ALL	NULL	NULL	NULL	NULL	1	

select min(7) from t2i join t1i;

min(7)

NULL

select max(a) from t1i;

max(a)

NULL

select max(7) from t1i;

max(7)

NULL

select max(7) from DUAL;

max(7)

NULL

explain select max(7) from t2i join t1i;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2i	ALL	NULL	NULL	NULL	NULL	1	

1	SIMPLE	t1i	ALL	NULL	NULL	NULL	NULL	1	

select max(7) from t2i join t1i;

max(7)

NULL

select 1, min(a) from t1i where a=99;

1	min(a)

1	NULL

select 1, min(a) from t1i where 1=99;

1	min(a)

1	NULL

select 1, min(1) from t1i where a=99;

1	min(1)

1	NULL

select 1, min(1) from t1i where 1=99;

1	min(1)

1	NULL

select 1, max(a) from t1i where a=99;

1	max(a)

1	NULL

select 1, max(a) from t1i where 1=99;

1	max(a)

1	NULL

select 1, max(1) from t1i where a=99;

1	max(1)

1	NULL

select 1, max(1) from t1i where 1=99;

1	max(1)

1	NULL

explain select count(*), min(7), max(7) from t1m, t1i;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1m	system	NULL	NULL	NULL	NULL	0	const row not found

1	SIMPLE	t1i	ALL	NULL	NULL	NULL	NULL	1	

select count(*), min(7), max(7) from t1m, t1i;

count(*)	min(7)	max(7)

0	NULL	NULL

explain select count(*), min(7), max(7) from t1m, t2i;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1m	system	NULL	NULL	NULL	NULL	0	const row not found

1	SIMPLE	t2i	ALL	NULL	NULL	NULL	NULL	1	

select count(*), min(7), max(7) from t1m, t2i;

count(*)	min(7)	max(7)

0	NULL	NULL

explain select count(*), min(7), max(7) from t2m, t1i;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2m	system	NULL	NULL	NULL	NULL	1	

1	SIMPLE	t1i	ALL	NULL	NULL	NULL	NULL	1	

select count(*), min(7), max(7) from t2m, t1i;

count(*)	min(7)	max(7)

0	NULL	NULL

drop table t1m, t1i, t2m, t2i;

create table t2 (ff double);

insert into t2 values (2.2);

select cast(sum(distinct ff) as decimal(5,2)) from t2;

mysql-test/r/loaddata.result

+10 −0
Original line number Diff line number Diff line
@@ -66,6 +66,16 @@ a b 
3	row 3

0	

drop table t1;

SET @OLD_SQL_MODE=@@SQL_MODE, @@SQL_MODE=NO_AUTO_VALUE_ON_ZERO;

create table t1(id integer not null auto_increment primary key);

insert into t1 values(0);

select * from t1;

id

0

select * from t1;

id

0

SET @@SQL_MODE=@OLD_SQL_MODE;

create table t1 (a int default 100, b int, c varchar(60));

load data infile '../../std_data/rpl_loaddata.dat' into table t1 (a, @b) set b=@b+10, c=concat("b=",@b);

select * from t1;

mysql-test/r/type_decimal.result

+9 −0
Original line number Diff line number Diff line
@@ -672,6 +672,15 @@ a 
9999.999

0000.000

drop table t1;

create table t1(a decimal(10,5), b decimal(10,1));

insert into t1 values(123.12345, 123.12345);

update t1 set b=a;

Warnings:

Warning	1265	Data truncated for column 'b' at row 1

select * from t1;

a	b

123.12345	123.1

drop table t1;

CREATE TABLE t1

(EMPNUM   CHAR(3) NOT NULL,

HOURS    DECIMAL(5));

mysql-test/t/func_group.test

+69 −0
Original line number Diff line number Diff line
@@ -539,6 +539,75 @@ INSERT INTO t1 VALUES 
SELECT MAX(id) FROM t1 WHERE id < 3 AND a=2 AND b=6;

DROP TABLE t1;



#

# Bug #12882  	min/max inconsistent on empty table

#



create table t1m (a int) engine=myisam;

create table t1i (a int) engine=innodb;

create table t2m (a int) engine=myisam;

create table t2i (a int) engine=innodb;

insert into t2m values (5);

insert into t2i values (5);



# test with MyISAM

select min(a) from t1m;

select min(7) from t1m;

select min(7) from DUAL;

explain select min(7) from t2m join t1m;

select min(7) from t2m join t1m;



select max(a) from t1m;

select max(7) from t1m;

select max(7) from DUAL;

explain select max(7) from t2m join t1m;

select max(7) from t2m join t1m;



select 1, min(a) from t1m where a=99;

select 1, min(a) from t1m where 1=99;

select 1, min(1) from t1m where a=99;

select 1, min(1) from t1m where 1=99;



select 1, max(a) from t1m where a=99;

select 1, max(a) from t1m where 1=99;

select 1, max(1) from t1m where a=99;

select 1, max(1) from t1m where 1=99;



# test with InnoDB

select min(a) from t1i;

select min(7) from t1i;

select min(7) from DUAL;

explain select min(7) from t2i join t1i;

select min(7) from t2i join t1i;



select max(a) from t1i;

select max(7) from t1i;

select max(7) from DUAL;

explain select max(7) from t2i join t1i;

select max(7) from t2i join t1i;



select 1, min(a) from t1i where a=99;

select 1, min(a) from t1i where 1=99;

select 1, min(1) from t1i where a=99;

select 1, min(1) from t1i where 1=99;



select 1, max(a) from t1i where a=99;

select 1, max(a) from t1i where 1=99;

select 1, max(1) from t1i where a=99;

select 1, max(1) from t1i where 1=99;



# mixed MyISAM/InnoDB test

explain select count(*), min(7), max(7) from t1m, t1i;

select count(*), min(7), max(7) from t1m, t1i;



explain select count(*), min(7), max(7) from t1m, t2i;

select count(*), min(7), max(7) from t1m, t2i;



explain select count(*), min(7), max(7) from t2m, t1i;

select count(*), min(7), max(7) from t2m, t1i;



drop table t1m, t1i, t2m, t2i;



# End of 4.1 tests



#

mysql-test/t/loaddata.test

+27 −0
Original line number Diff line number Diff line
@@ -31,6 +31,33 @@ load data infile '../../std_data/loaddata4.dat' into table t1 fields terminated 
select * from t1;

drop table t1;





#

# Bug #12053 LOAD DATA INFILE ignores NO_AUTO_VALUE_ON_ZERO setting

#

SET @OLD_SQL_MODE=@@SQL_MODE, @@SQL_MODE=NO_AUTO_VALUE_ON_ZERO;

create table t1(id integer not null auto_increment primary key);

insert into t1 values(0);

disable_query_log;

eval SELECT * INTO OUTFILE '$MYSQL_TEST_DIR/var/tmp/t1' from t1;

delete from t1;

eval load data infile '$MYSQL_TEST_DIR/var/tmp/t1' into table t1;

enable_query_log;

select * from t1;

--exec rm $MYSQL_TEST_DIR/var/tmp/t1



disable_query_log;

eval SELECT * INTO OUTFILE '$MYSQL_TEST_DIR/var/tmp/t1'

FIELDS TERMINATED BY '' OPTIONALLY ENCLOSED BY '' LINES TERMINATED BY '\r\n'

FROM t1;

delete from t1;

eval load data infile '$MYSQL_TEST_DIR/var/tmp/t1' into table t1

FIELDS TERMINATED BY '' OPTIONALLY ENCLOSED BY '' LINES TERMINATED BY '\r\n';

enable_query_log;

select * from t1;

--exec rm $MYSQL_TEST_DIR/var/tmp/t1

SET @@SQL_MODE=@OLD_SQL_MODE;



# End of 4.1 tests



#