database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint

Browse Source 
into  mysql.com:/home/tnurnberg/mysql-5.0-maint-19409
This commit is contained in:
unknown
2006-06-22 22:21:43 +02:00
parent e8beb72cc6 0271faa8c2
commit 357755fc1f
4 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/func_timestamp.result
View File

@ -1,4 +1,5 @@
drop table if exists t1;
set time_zone="+03:00";
create table t1 (Zeit time, Tag tinyint not null, Monat tinyint not null,
Jahr smallint not null, index(Tag), index(Monat), index(Jahr) );
insert into t1 values ("09:26:00",16,9,1998),("09:26:00",16,9,1998);
@ -9,3 +10,4 @@ Date Unix
1998-9-16 09:26:00 905927160
1998-9-16 09:26:00 905927160
drop table t1;
set time_zone= @@global.time_zone;

2
mysql-test/r/type_timestamp.result
View File

@ -1,4 +1,5 @@
drop table if exists t1,t2;
set time_zone="+03:00";
CREATE TABLE t1 (a int, t timestamp);
CREATE TABLE t2 (a int, t datetime);
SET TIMESTAMP=1234;
@ -491,3 +492,4 @@ a b c
5 NULL 2001-09-09 04:46:59
6 NULL 2006-06-06 06:06:06
drop table t1;
set time_zone= @@global.time_zone;

6
mysql-test/t/func_timestamp.test
View File

@ -6,6 +6,9 @@
drop table if exists t1;
--enable_warnings
# Set timezone to GMT-3, to make it possible to use "interval 3 hour"
set time_zone="+03:00";
create table t1 (Zeit time, Tag tinyint not null, Monat tinyint not null,
Jahr smallint not null, index(Tag), index(Monat), index(Jahr) );
insert into t1 values ("09:26:00",16,9,1998),("09:26:00",16,9,1998);
@ -15,3 +18,6 @@ FROM t1;
drop table t1;
# End of 4.1 tests
# Restore timezone to default
set time_zone= @@global.time_zone;

6
mysql-test/t/type_timestamp.test
View File

@ -6,6 +6,9 @@
drop table if exists t1,t2;
--enable_warnings
# Set timezone to GMT-3, to make it possible to use "interval 3 hour"
set time_zone="+03:00";
CREATE TABLE t1 (a int, t timestamp);
CREATE TABLE t2 (a int, t datetime);
SET TIMESTAMP=1234;
@ -322,3 +325,6 @@ select * from t1;
drop table t1;
# End of 4.1 tests
# Restore timezone to default
set time_zone= @@global.time_zone;