Commit f16873ec authored by unknown's avatar unknown
Browse files

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

into mashka.mysql.fi:/home/my/mysql-3.23
parents 72f44daf ddd2f4fc

man/perror.1

+5 −10
Original line number Diff line number Diff line 
.TH perror 1 "19 December 2000" "MySQL 3.23" "MySQL database"

.SH NAME

.BR perror

can be used to display a description for a system error code, or an MyISAM/ISAM table handler error code. The error messages are mostly system dependent. 

.SH USAGE

perror [OPTIONS] [ERRORCODE [ERRORCODE...]]

perror \- describes a system or MySQL error code.

.SH SYNOPSIS

.B perror

.RB [ \-? | \-\-help ]

.RB [ \-I | \-\-info ]

.RB [ \-s | \-\-silent ]

.RB [ \-v | \-\-verbose ]

.RB [ \-V | \-\-version ]

perror [OPTIONS] [ERRORCODE [ERRORCODE...]]

.SH DESCRIPTION

Can be used to display a description for a system error code, or an MyISAM/ISAM table handler error code.

The error messages are mostly system dependent.

.SH OPTIONS

.TP 

.BR  \-? | \-\-help    

Displays this help and exits.

mysql-test/r/group_by.result

+1 −0
Original line number Diff line number Diff line
@@ -128,3 +128,4 @@ a MAX(b) ELT(MAX(b), 'a', 'b', 'c', 'd', 'e', 'f') 
a	MAX(b)	MAKE_SET(MAX(b), 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h')

1	4	c

10	43	a,b,d,f

a	c	count(distinct rand())

mysql-test/r/select.result

+1 −0
Original line number Diff line number Diff line
@@ -1793,3 +1793,4 @@ Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_par 
t2	0	PRIMARY	1	auto	A	1199	NULL	NULL	

t2	0	fld1	1	fld1	A	1199	NULL	NULL	

t2	1	fld3	1	fld3	A	NULL	NULL	NULL	

1

mysql-test/t/group_by.test

+8 −0
Original line number Diff line number Diff line
@@ -346,3 +346,11 @@ select a, MAX(b), CONCAT_WS(MAX(b), '43', '4', '5') from t1 group by a; 
select a, MAX(b), ELT(MAX(b), 'a', 'b', 'c', 'd', 'e', 'f') from t1 group by a;

select a, MAX(b), MAKE_SET(MAX(b), 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h') from t1 group by a;

drop table t1;



# not purely group_by bug, but group_by is involved...



create table t1 (a date default null, b date default null);

insert t1 values ('1999-10-01','2000-01-10'), ('1997-01-01','1998-10-01');

select a,min(b) c,count(distinct rand()) from t1 group by a having c<a + interval 1 day;

drop table t1;

mysql-test/t/select.test

+16 −1
Original line number Diff line number Diff line
@@ -1712,6 +1712,21 @@ show full columns from t2 from test like 'f%'; 
show full columns from t2 from test like 's%';

show keys from t2;



#

# random in WHERE clause

#



drop table t1;

CREATE TABLE t1 (

  id mediumint(8) unsigned NOT NULL auto_increment,

  pseudo varchar(35) NOT NULL default '',

  PRIMARY KEY  (id),

  UNIQUE KEY pseudo (pseudo)

);

INSERT INTO t1 (pseudo) VALUES ('test');

INSERT INTO t1 (pseudo) VALUES ('test1');

SELECT 1 from t1 where rand() > 2;



#

# Drop the test tables

#