diff options
| author | unknown <monty@mysql.com> | 2004-11-12 17:44:17 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-11-12 17:44:17 +0200 |
| commit | 55ae2e788088067fe539020c5162f4cfd96dfe43 (patch) | |
| tree | ed1b1c23390d48668f06ceff0a8f851e16568f90 /mysql-test/r/timezone3.result | |
| parent | 44070705ea958c57faa486e7f22ca5fb1ada095c (diff) | |
| download | mariadb-git-55ae2e788088067fe539020c5162f4cfd96dfe43.tar.gz | |
After merge fixes
client/mysqldump.c:
Merge with 4.0 (and reordering of options)
client/mysqltest.c:
Added DB as a user variable
myisam/mi_check.c:
Trivial cleanup
mysql-test/r/grant.result:
Move test to be in same order as in 4.0
mysql-test/r/mix_innodb_myisam_binlog.result:
Updated results
mysql-test/r/ps_1general.result:
Updated tests to work after privilege fixes
mysql-test/r/timezone3.result:
Updated results to 4.1
mysql-test/t/ps_1general.test:
Updated tests to work after privilege fixes
sql-common/my_time.c:
Applied sub-second patch from 4.0
sql/sql_acl.cc:
More debugging
Diffstat (limited to 'mysql-test/r/timezone3.result')
| -rw-r--r-- | mysql-test/r/timezone3.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/timezone3.result b/mysql-test/r/timezone3.result index 2135dd33511..ec0b6045f93 100644 --- a/mysql-test/r/timezone3.result +++ b/mysql-test/r/timezone3.result @@ -36,6 +36,6 @@ create table t1 (ts timestamp); insert into t1 values (19730101235900), (20040101235900); select * from t1; ts -19730101235900 -20040101235900 +1973-01-01 23:59:00 +2004-01-01 23:59:00 drop table t1; |