Commit 1e87c820 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/dlenev/src/mysql-4.0-bg6387
parents 7651674f d259ba40

mysql-test/Makefile.am

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ dist-hook: 
	$(INSTALL_DATA) $(srcdir)/r/*.result $(srcdir)/r/*.require $(distdir)/r

	$(INSTALL_DATA) $(srcdir)/std_data/*.dat $(srcdir)/std_data/*.001 $(distdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/des_key_file $(distdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/Moscow_leap $(distdir)/std_data



install-data-local:

	$(mkinstalldirs) \
@@ -50,6 +51,7 @@ install-data-local: 
	$(INSTALL_DATA) $(srcdir)/std_data/*.dat $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.*001 $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/des_key_file $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/Moscow_leap $(DESTDIR)$(testdir)/std_data



SUFFIXES = .sh

mysql-test/r/have_moscow_leap_timezone.require

0 → 100644
+2 −0
Original line number Diff line number Diff line 
from_unixtime(1072904422)

2004-01-01 00:00:00

mysql-test/r/timezone3.result

0 → 100644
+41 −0
Original line number Diff line number Diff line 
drop table if exists t1;

create table t1 (i int, c varchar(20));

insert into t1 values

(unix_timestamp("2004-01-01 00:00:00"), "2004-01-01 00:00:00");

insert into t1 values

(unix_timestamp("2004-03-28 01:59:59"), "2004-03-28 01:59:59"),

(unix_timestamp("2004-03-28 02:30:00"), "2004-03-28 02:30:00"),

(unix_timestamp("2004-03-28 03:00:00"), "2004-03-28 03:00:00");

insert into t1 values

(unix_timestamp('2004-05-01 00:00:00'),'2004-05-01 00:00:00');

insert into t1 values

(unix_timestamp('2004-10-31 01:00:00'),'2004-10-31 01:00:00'),

(unix_timestamp('2004-10-31 02:00:00'),'2004-10-31 02:00:00'),

(unix_timestamp('2004-10-31 02:59:59'),'2004-10-31 02:59:59'),

(unix_timestamp('2004-10-31 04:00:00'),'2004-10-31 04:00:00'),

(unix_timestamp('2004-10-31 02:59:59'),'2004-10-31 02:59:59');

insert into t1 values

(unix_timestamp('1981-07-01 03:59:59'),'1981-07-01 03:59:59'),

(unix_timestamp('1981-07-01 04:00:00'),'1981-07-01 04:00:00');

select i, from_unixtime(i), c from t1;

i	from_unixtime(i)	c

1072904422	2004-01-01 00:00:00	2004-01-01 00:00:00

1080428421	2004-03-28 01:59:59	2004-03-28 01:59:59

1080428422	2004-03-28 03:00:00	2004-03-28 02:30:00

1080428422	2004-03-28 03:00:00	2004-03-28 03:00:00

1083355222	2004-05-01 00:00:00	2004-05-01 00:00:00

1099170022	2004-10-31 01:00:00	2004-10-31 01:00:00

1099177222	2004-10-31 02:00:00	2004-10-31 02:00:00

1099180821	2004-10-31 02:59:59	2004-10-31 02:59:59

1099184422	2004-10-31 04:00:00	2004-10-31 04:00:00

1099180821	2004-10-31 02:59:59	2004-10-31 02:59:59

362793608	1981-07-01 03:59:59	1981-07-01 03:59:59

362793610	1981-07-01 04:00:00	1981-07-01 04:00:00

drop table t1;

create table t1 (ts timestamp);

insert into t1 values (19730101235900), (20040101235900);

select * from t1;

ts

19730101235900

20040101235900

drop table t1;

mysql-test/std_data/Moscow_leap

0 → 100644
+991 B

File added.

No diff preview for this file type.

View file

mysql-test/t/timezone3-master.opt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
--timezone=:$MYSQL_TEST_DIR/std_data/Moscow_leap