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

Merge mysql.com:/home/mydev/mysql-5.0 

into  mysql.com:/home/mydev/mysql-5.0-bug5390
parents e55b495d e70d0971

mysql-test/r/having.result

+0 −2
Original line number Diff line number Diff line
@@ -360,8 +360,6 @@ s1 count(s1) 
y	1

drop table t1;

DROP SCHEMA IF EXISTS HU;

Warnings:

Note	1008	Can't drop database 'HU'; database doesn't exist

CREATE SCHEMA HU ;

USE HU ;

CREATE TABLE STAFF

mysql-test/r/type_bit.result

+9 −0
Original line number Diff line number Diff line
@@ -564,3 +564,12 @@ b1+0 sum(b1) sum(b2) 
1	4	4

2	2	2

drop table t1, t2;

create table t1 (a bit(7));

insert into t1 values (0x60);

select * from t1;

Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def	test	t1	t1	a	a	16	7	1	Y	0	0	63

a

`

drop table t1;

End of 5.0 tests

mysql-test/r/type_bit_innodb.result

+9 −0
Original line number Diff line number Diff line
@@ -402,3 +402,12 @@ t1 CREATE TABLE `t1` ( 
  `b` bit(10) default NULL

) ENGINE=InnoDB DEFAULT CHARSET=latin1

drop table t1;

create table t1 (a bit(7)) engine=innodb;

insert into t1 values (0x60);

select * from t1;

Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def	test	t1	t1	a	a	16	7	1	Y	0	0	63

a

`

drop table t1;

End of 5.0 tests

mysql-test/r/view.result

+21 −0
Original line number Diff line number Diff line
@@ -2579,3 +2579,24 @@ COUNT(*) 
2

DROP VIEW v2;

DROP TABLE t1, t2;

CREATE TABLE t1 (id int NOT NULL PRIMARY KEY,

td date DEFAULT NULL, KEY idx(td));

INSERT INTO t1 VALUES 

(1, '2005-01-01'), (2, '2005-01-02'), (3, '2005-01-02'),

(4, '2005-01-03'), (5, '2005-01-04'), (6, '2005-01-05'),

(7, '2005-01-05'), (8, '2005-01-05'), (9, '2005-01-06');

CREATE VIEW v1 AS SELECT * FROM t1;

SELECT * FROM t1 WHERE td BETWEEN '2005.01.02' AND '2005.01.04';

id	td

2	2005-01-02

3	2005-01-02

4	2005-01-03

5	2005-01-04

SELECT * FROM v1 WHERE td BETWEEN '2005.01.02' AND '2005.01.04';

id	td

2	2005-01-02

3	2005-01-02

4	2005-01-03

5	2005-01-04

DROP VIEW v1;

DROP TABLE t1;

mysql-test/t/having.test

+2 −0
Original line number Diff line number Diff line
@@ -354,7 +354,9 @@ drop table t1; 
# when the server is run on Windows or with --lower-case-table-names=1

#



--disable_warnings

DROP SCHEMA IF EXISTS HU;

--enable_warnings

CREATE SCHEMA HU ;

USE HU ;