diff options
| author | unknown <ramil@mysql.com> | 2005-02-28 19:59:38 +0400 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2005-02-28 19:59:38 +0400 |
| commit | f9dd79c77d3690cee26aeb0949b74ac76fccdcae (patch) | |
| tree | 6f12cb96c51f12a54cc4aaabfbed0b10a5a08834 /mysql-test/t/func_sapdb.test | |
| parent | 3bffc522317ad18102f8a2e5079e3242b6866dcf (diff) | |
| parent | c8b3d65ca26ff2be783115da2fb7c790dd4338e4 (diff) | |
| download | mariadb-git-f9dd79c77d3690cee26aeb0949b74ac76fccdcae.tar.gz | |
merging
mysql-test/r/ps.result:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'mysql-test/t/func_sapdb.test')
| -rw-r--r-- | mysql-test/t/func_sapdb.test | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/func_sapdb.test b/mysql-test/t/func_sapdb.test index 2ae3c438243..de433485fca 100644 --- a/mysql-test/t/func_sapdb.test +++ b/mysql-test/t/func_sapdb.test @@ -54,6 +54,7 @@ select timediff("1997-12-31 23:59:59.000001","1997-12-30 01:01:01.000002"); select timediff("1997-12-30 23:59:59.000001","1997-12-31 23:59:59.000002"); select timediff("1997-12-31 23:59:59.000001","23:59:59.000001"); select timediff("2000:01:01 00:00:00", "2000:01:01 00:00:00.000001"); +select timediff("2005-01-11 15:48:49.999999", "2005-01-11 15:48:50"); --enable_ps_protocol select maketime(10,11,12); |