Commit 7afbb734 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/my/mysql-4.0
parents 87026280 8b9ecce0

mysql-test/mysql-test-run.sh

+1 −1
Original line number Diff line number Diff line
@@ -587,7 +587,7 @@ show_failed_diff () 
    $DIFF -c $result_file $reject_file

    echo "-------------------------------------------------------"

    echo "Please follow the instructions outlined at"

    echo "http://www.mysql.com/doc/R/e/Reporting_mysqltest_bugs.html"

    echo "http://www.mysql.com/doc/en/Reporting_mysqltest_bugs.html"

    echo "to find the reason to this problem and how to report this."

  fi

}

mysql-test/r/func_time.result

+30 −0
Original line number Diff line number Diff line
@@ -352,6 +352,36 @@ extract(SECOND FROM "1999-01-02 10:11:12") 
select extract(MONTH FROM "2001-02-00");

extract(MONTH FROM "2001-02-00")

2

SELECT "1900-01-01 00:00:00" + INTERVAL 2147483648 SECOND;

"1900-01-01 00:00:00" + INTERVAL 2147483648 SECOND

1968-01-20 03:14:08

SELECT "1900-01-01 00:00:00" + INTERVAL "1:2147483647" MINUTE_SECOND;

"1900-01-01 00:00:00" + INTERVAL "1:2147483647" MINUTE_SECOND

1968-01-20 03:15:07

SELECT "1900-01-01 00:00:00" + INTERVAL "100000000:214748364700" MINUTE_SECOND;

"1900-01-01 00:00:00" + INTERVAL "100000000:214748364700" MINUTE_SECOND

8895-03-27 22:11:40

SELECT "1900-01-01 00:00:00" + INTERVAL 1<<37 SECOND;

"1900-01-01 00:00:00" + INTERVAL 1<<37 SECOND

6255-04-08 15:04:32

SELECT "1900-01-01 00:00:00" + INTERVAL 1<<31 MINUTE;

"1900-01-01 00:00:00" + INTERVAL 1<<31 MINUTE

5983-01-24 02:08:00

SELECT "1900-01-01 00:00:00" + INTERVAL 1<<20 HOUR;

"1900-01-01 00:00:00" + INTERVAL 1<<20 HOUR

2019-08-15 16:00:00

SELECT "1900-01-01 00:00:00" + INTERVAL 1<<38 SECOND;

"1900-01-01 00:00:00" + INTERVAL 1<<38 SECOND

NULL

SELECT "1900-01-01 00:00:00" + INTERVAL 1<<33 MINUTE;

"1900-01-01 00:00:00" + INTERVAL 1<<33 MINUTE

NULL

SELECT "1900-01-01 00:00:00" + INTERVAL 1<<30 HOUR;

"1900-01-01 00:00:00" + INTERVAL 1<<30 HOUR

NULL

SELECT "1900-01-01 00:00:00" + INTERVAL "1000000000:214748364700" MINUTE_SECOND;

"1900-01-01 00:00:00" + INTERVAL "1000000000:214748364700" MINUTE_SECOND

NULL

create table t1 (ctime varchar(20));

insert into t1 values ('2001-01-12 12:23:40');

select ctime, hour(ctime) from t1;

mysql-test/r/raid.result

+8 −0
Original line number Diff line number Diff line
@@ -2,6 +2,14 @@ create database test_raid; 
create table test_raid.r1 (i int) raid_type=1;

create table test_raid.r2 (i int) raid_type=1 raid_chunks=32;

drop database test_raid;

create database test_raid;

create table test_raid.r2 (i int) raid_type=1 raid_chunks=257;

show create table test_raid.r2;

Table	Create Table

r2	CREATE TABLE `r2` (

  `i` int(11) default NULL

) TYPE=MyISAM RAID_TYPE=striped RAID_CHUNKS=255 RAID_CHUNKSIZE=256

drop database test_raid;

DROP TABLE IF EXISTS t1,t2;

CREATE TABLE t1 (

id int unsigned not null auto_increment primary key,

mysql-test/t/func_time.test

+18 −1
Original line number Diff line number Diff line
@@ -136,10 +136,27 @@ select extract(MINUTE_SECOND FROM "10:11:12"); 
select extract(SECOND FROM "1999-01-02 10:11:12");

select extract(MONTH FROM "2001-02-00");



#

# Test big intervals (Bug #3498)

#

SELECT "1900-01-01 00:00:00" + INTERVAL 2147483648 SECOND;

SELECT "1900-01-01 00:00:00" + INTERVAL "1:2147483647" MINUTE_SECOND;

SELECT "1900-01-01 00:00:00" + INTERVAL "100000000:214748364700" MINUTE_SECOND;SELECT "1900-01-01 00:00:00" + INTERVAL 1<<37 SECOND;

SELECT "1900-01-01 00:00:00" + INTERVAL 1<<31 MINUTE;

SELECT "1900-01-01 00:00:00" + INTERVAL 1<<20 HOUR;



SELECT "1900-01-01 00:00:00" + INTERVAL 1<<38 SECOND;

SELECT "1900-01-01 00:00:00" + INTERVAL 1<<33 MINUTE;

SELECT "1900-01-01 00:00:00" + INTERVAL 1<<30 HOUR;

SELECT "1900-01-01 00:00:00" + INTERVAL "1000000000:214748364700" MINUTE_SECOND;



#

# Bug #614 (multiple extracts in where)

#



create table t1 (ctime varchar(20));

insert into t1 values ('2001-01-12 12:23:40');

select ctime, hour(ctime) from t1;

# test bug 614 (multiple extracts in where)

select ctime from t1 where extract(MONTH FROM ctime) = 1 AND extract(YEAR FROM ctime) = 2001;

drop table t1;

mysql-test/t/raid.test

+9 −0
Original line number Diff line number Diff line
@@ -11,6 +11,15 @@ create database test_raid; 
create table test_raid.r1 (i int) raid_type=1;

create table test_raid.r2 (i int) raid_type=1 raid_chunks=32;

drop database test_raid;



#

# Bug #3182: Test using more than 257 raid chunks

#

create database test_raid;

create table test_raid.r2 (i int) raid_type=1 raid_chunks=257;

show create table test_raid.r2;

drop database test_raid;



DROP TABLE IF EXISTS t1,t2;

CREATE TABLE t1 (

id int unsigned not null auto_increment primary key,